diff --git a/.gitignore b/.gitignore
index 1ed32e43c9..11489c2ac9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ Thumbs.db
 /cache/
 /cache-*/
 /cache_gdal/
+/mrf_cache/
 /documentation/
 /logs/
 /screenshots/
diff --git a/CREDITS.md b/CREDITS.md
index 453225ea81..c8c08729da 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -12,7 +12,7 @@ Jonas Strandstedt
 Michal Marcinkowski
 Joakim Kilby
 Lovisa Hassler
-Mikael Petterson 
+Mikael Petterson
 Erik Sundén
 Stefan Lindblad
 Corrie Roe
diff --git a/Jenkinsfile b/Jenkinsfile
index 7405ada9a9..69935d0b96 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ if (env.CHANGE_BRANCH) {
 def readDir() {
   def dirsl = [];
   new File("${workspace}").eachDir() {
-    dirs -> println dirs.getName() 
+    dirs -> println dirs.getName()
     if (!dirs.getName().startsWith('.')) {
       dirsl.add(dirs.getName());
     }
@@ -27,7 +27,7 @@ def readDir() {
 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');
   };
@@ -61,8 +61,8 @@ parallel tools: {
       recordIssues(
         id: 'tools-cppcheck',
         tool: cppCheck(pattern: 'build/cppcheck.xml')
-      ) 
-    }  
+      )
+    }
     cleanWs()
   } // node('tools')
 },
@@ -101,7 +101,7 @@ linux_gcc_make: {
             testHelper.runUnitTests('bin/GhoulTest');
           }
         }
-      
+
         stage('linux-gcc-make/test-openspace') {
           timeout(time: 2, unit: 'MINUTES') {
             testHelper.runUnitTests('bin/OpenSpaceTest');
@@ -264,7 +264,7 @@ windows_msvc: {
             testHelper.runUnitTests('bin\\Debug\\codegentest');
           }
         }
-      
+
         stage('windows-msvc/test-sgct') {
           timeout(time: 2, unit: 'MINUTES') {
             testHelper.runUnitTests('bin\\Debug\\SGCTTest');
@@ -282,7 +282,7 @@ windows_msvc: {
             testHelper.runUnitTests('bin\\Debug\\OpenSpaceTest');
           }
         }
-      }      
+      }
       cleanWs()
     } // node('windows')
   }
@@ -343,7 +343,7 @@ macos_make: {
             testHelper.runUnitTests('bin/Debug/OpenSpaceTest');
           }
         }
-      }        
+      }
       cleanWs()
     } // node('macos')
   }
@@ -384,7 +384,7 @@ macos_xcode: {
             testHelper.runUnitTests('bin/Debug/OpenSpaceTest');
           }
         }
-      } 
+      }
        cleanWs()
     } // node('macos')
   }
diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index 80670c427e..94ecb33a82 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -141,7 +141,7 @@ if (WIN32)
   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 \"$<TARGET_FILE:OpenSpace>\"
+    COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}" --verbose 0 --no-compiler-runtime --no-translations \"$<TARGET_FILE:OpenSpace>\"
     COMMENT "Deploying Qt libraries"
   )
 endif ()
diff --git a/apps/OpenSpace/ext/launcher/CMakeLists.txt b/apps/OpenSpace/ext/launcher/CMakeLists.txt
index b1c87bfe64..f7a465bd3c 100644
--- a/apps/OpenSpace/ext/launcher/CMakeLists.txt
+++ b/apps/OpenSpace/ext/launcher/CMakeLists.txt
@@ -113,9 +113,6 @@ target_include_directories(
   openspace-ui-launcher
   PUBLIC
   include
-  # @TODO:  This should be handled in a better way
-  ../sgct/include
-  ../sgct/sgct/ext/glm
 )
 target_link_libraries(
   openspace-ui-launcher
@@ -126,6 +123,8 @@ target_link_libraries(
     Qt${QT_VERSION_MAJOR}::Gui
     Qt${QT_VERSION_MAJOR}::Widgets
     Qt${QT_VERSION_MAJOR}::Network
+  PRIVATE
+    sgct
 )
 
 target_precompile_headers(openspace-ui-launcher PRIVATE
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 60257a1ab3..9f379e3d63 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -31,6 +31,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
+#include <sgct/readconfig.h>
 #include <QComboBox>
 #include <QFile>
 #include <QLabel>
@@ -41,7 +42,10 @@
 #include <fstream>
 #include <iostream>
 #include <random>
-#include <sgct/readconfig.h>
+
+#ifdef WIN32
+#include <Windows.h>
+#endif // WIN32
 
 using namespace openspace;
 
@@ -137,11 +141,29 @@ namespace {
 
     void saveProfile(QWidget* parent, const std::string& path, const Profile& p) {
         std::ofstream outFile;
+        outFile.exceptions(std::ofstream::badbit | std::ofstream::failbit);
         try {
             outFile.open(path, std::ofstream::out);
             outFile << p.serialize();
         }
         catch (const std::ofstream::failure& e) {
+#ifdef WIN32
+            if (std::filesystem::exists(path)) {
+                // Check if the file is hidden, since that causes ofstream to fail
+                DWORD res = GetFileAttributesA(path.c_str());
+                if (res & FILE_ATTRIBUTE_HIDDEN) {
+                    QMessageBox::critical(
+                        parent,
+                        "Exception",
+                        QString::fromStdString(fmt::format(
+                            "Error writing data to file: '{}' as file is marked hidden",
+                            path
+                        ))
+                    );
+                    return;
+                }
+            }
+#endif // WIN32
             QMessageBox::critical(
                 parent,
                 "Exception",
diff --git a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
index b1bdd0b3ae..a466f450af 100644
--- a/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
+++ b/apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
@@ -36,6 +36,7 @@
 #include <QLineEdit>
 #include <QPushButton>
 #include <QSpinBox>
+#include <numbers>
 
 namespace {
     std::array<std::string, 4> MonitorNames = {
@@ -59,8 +60,8 @@ namespace {
     };
 
     constexpr int LineEditWidthFixedWindowSize = 50;
-    constexpr float DefaultFovH = 80.f;
-    constexpr float DefaultFovV = 50.534f;
+    constexpr float DefaultFovLongEdge = 80.f;
+    constexpr float DefaultFovShortEdge = 50.534f;
     constexpr float DefaultHeightOffset = 0.f;
     constexpr int MaxWindowSizePixels = 10000;
     constexpr double FovEpsilon = 0.00001;
@@ -358,7 +359,7 @@ QWidget* WindowControl::createPlanarWidget() {
     _planar.fovH = new QDoubleSpinBox;
     _planar.fovH->setMinimum(FovEpsilon);
     _planar.fovH->setMaximum(180.0 - FovEpsilon);
-    _planar.fovH->setValue(DefaultFovH);
+    _planar.fovH->setValue(DefaultFovLongEdge);
     _planar.fovH->setEnabled(false);
     _planar.fovH->setToolTip(hfovTip);
     _planar.fovH->setSizePolicy(
@@ -376,7 +377,7 @@ QWidget* WindowControl::createPlanarWidget() {
     _planar.fovV = new QDoubleSpinBox;
     _planar.fovV->setMinimum(FovEpsilon);
     _planar.fovV->setMaximum(180.0 - FovEpsilon);
-    _planar.fovV->setValue(DefaultFovV);
+    _planar.fovV->setValue(DefaultFovShortEdge);
     _planar.fovV->setEnabled(false);
     _planar.fovV->setToolTip(vfovTip);
     _planar.fovV->setSizePolicy(
@@ -614,8 +615,8 @@ void WindowControl::resetToDefaults() {
     _fisheye.spoutOutput->setChecked(false);
     _equirectangular.spoutOutput->setChecked(false);
     _projectionType->setCurrentIndex(static_cast<int>(ProjectionIndices::Planar));
-    _planar.fovV->setValue(DefaultFovH);
-    _planar.fovV->setValue(DefaultFovV);
+    _planar.fovV->setValue(DefaultFovLongEdge);
+    _planar.fovV->setValue(DefaultFovShortEdge);
     _cylindrical.heightOffset->setValue(DefaultHeightOffset);
     _fisheye.quality->setCurrentIndex(2);
     _sphericalMirror.quality->setCurrentIndex(2);
@@ -816,14 +817,21 @@ void WindowControl::onFovLockClicked() {
 }
 
 void WindowControl::updatePlanarLockedFov() {
-    const float aspectRatio = _windowDimensions.width() / _windowDimensions.height();
-    const float ratio = aspectRatio / IdealAspectRatio;
-    if (ratio >= 1.f) {
-        _planar.fovH->setValue(std::min(DefaultFovH * ratio, 180.f));
-        _planar.fovV->setValue(DefaultFovV);
+    bool landscapeOrientation = (_windowDimensions.width() >= _windowDimensions.height());
+    float aspectRatio;
+    if (landscapeOrientation) {
+        aspectRatio = _windowDimensions.width() / _windowDimensions.height();
     }
     else {
-        _planar.fovH->setValue(DefaultFovH);
-        _planar.fovV->setValue(std::min(DefaultFovV / ratio, 180.f));
+        aspectRatio = _windowDimensions.height() / _windowDimensions.width();
     }
+
+    float adjustedFov = 2.f * atan(aspectRatio * 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>;
+    adjustedFov = std::min(adjustedFov, 180.f);
+
+    _planar.fovH->setValue(landscapeOrientation ? adjustedFov : DefaultFovShortEdge);
+    _planar.fovV->setValue(landscapeOrientation ? DefaultFovShortEdge : adjustedFov);
 }
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 2f82990b3d..05ed52d053 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 2f82990b3dddb1404d83cee4ed7ea9d76068960d
+Subproject commit 05ed52d0533b95954913a363499bb828512a6245
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 1cfd5e0ee2..3cc1e87ab5 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -80,6 +80,7 @@
 
 #include <launcherwindow.h>
 #include <QApplication>
+#include <QMessageBox>
 
 using namespace openspace;
 using namespace sgct;
@@ -1258,6 +1259,19 @@ int main(int argc, char* argv[]) {
         QApplication app(qac, nullptr);
 #endif // __APPLE__
 
+        std::string pwd = std::filesystem::current_path().string();
+        if (size_t it = pwd.find_first_of("'\"[]");  it != std::string::npos) {
+            QMessageBox::warning(
+                nullptr,
+                "OpenSpace",
+                QString::fromStdString(fmt::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
+                ))
+            );
+        }
+
         LauncherWindow win(
             !hasProfile,
             *global::configuration,
@@ -1280,11 +1294,12 @@ int main(int argc, char* argv[]) {
             windowConfiguration,
             labelFromCfgFile
         );
-    } else {
+    }
+    else {
         glfwInit();
     }
     if (global::configuration->profile.empty()) {
-        LFATAL("Cannot launch with an empty profile");
+        LFATAL("Cannot launch without a profile");
         exit(EXIT_FAILURE);
     }
 
diff --git a/data/assets/actions/planets/mars_layers.asset b/data/assets/actions/planets/mars_layers.asset
index aec3d7ec86..8eccca5000 100644
--- a/data/assets/actions/planets/mars_layers.asset
+++ b/data/assets/actions/planets/mars_layers.asset
@@ -13,7 +13,7 @@ asset.export("ctx_enable_action", ctx_enable_action.Identifier)
 
 local ctx_disable_action = {
   Identifier = "os.mars.ctx.fadedout",
-  Name = "Fade out CTX Layer",
+  Name = "Fade out CTX layer",
   Command = [[openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.CTX_blended_01.Settings.Opacity", 0, 2.0)]],
   Documentation = "Fade out CTX",
   GuiPath = "/Solar System/Mars",
@@ -46,7 +46,7 @@ asset.export("hirise_disable_action", hirise_disable_action.Identifier)
 
 local lshirise_enable_action = {
   Identifier = "os.mars.lshirise.fadein",
-  Name = "Fade in HiRISE Local Set",
+  Name = "Fade in HiRISE local set",
   Command = [[
 openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled", true)
 openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled", true)
@@ -60,7 +60,7 @@ asset.export("lshirise_enable_action", lshirise_enable_action.Identifier)
 
 local lshirise_disable_action = {
   Identifier = "os.mars.lshirise.fadedout",
-  Name = "Fade out HiRISE Local Set",
+  Name = "Fade out HiRISE local set",
   Command = [[openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Settings.Opacity", 0, 2.0)
 openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled", false)]],
   Documentation = "Fade out HiRISE local set layer for Mars",
diff --git a/data/assets/actions/planets/planet_lighting.asset b/data/assets/actions/planets/planet_lighting.asset
index 509988774d..f5835e6c9b 100644
--- a/data/assets/actions/planets/planet_lighting.asset
+++ b/data/assets/actions/planets/planet_lighting.asset
@@ -28,7 +28,7 @@ local list = openspace.getProperty("Scene." .. node .. ".Renderable.Layers.Night
 if (#list > 0) then
   openspace.setPropertyValue(list[1], true)
 else
-  openspace.setPropertyValueSingle("Scene." .. node .. ".Renderable.PerformShading", true) 
+  openspace.setPropertyValueSingle("Scene." .. node .. ".Renderable.PerformShading", true)
 end
 if openspace.hasSceneGraphNode(node .. "Atmosphere") then
   openspace.setPropertyValueSingle("Scene." .. node .. "Atmosphere.Renderable.SunFollowingCamera", false)
@@ -45,11 +45,11 @@ end
 
 local function getIlluminationAction(node, node_lower, global)
   local actionString = "_standard_illumination"
-  local actionName = "Standard Illumination"
+  local actionName = "standard illumination"
   local actionCommand = getIlluminationCommand(node, global)
   if (global) then
     actionString = "_global_illumination"
-    actionName = "Global Illumination"
+    actionName = "global illumination"
     actionCommand = getIlluminationCommand(node, global)
   end
 
diff --git a/data/assets/actions/planets/scale_planets_and_moons.asset b/data/assets/actions/planets/scale_planets_and_moons.asset
index b5cb38d471..629fdfca27 100644
--- a/data/assets/actions/planets/scale_planets_and_moons.asset
+++ b/data/assets/actions/planets/scale_planets_and_moons.asset
@@ -28,7 +28,7 @@ end
 local function getToggleScaleAction(identifier, scale, name, speedup, speedown)
   local action = {
     Identifier = "os.toggle_" .. string.gsub(name, "%s+", "") .. "_scale",
-    Name = "Toggle " .. name .. " Scale",
+    Name = "Toggle " .. name .. " scale",
     Command = [[
 local list = openspace.getProperty("]] .. identifier .. [[.Scale.Scale");
 if #list == 0 then
diff --git a/data/assets/actions/system/undo_event_fades.asset b/data/assets/actions/system/undo_event_fades.asset
index ed8249386c..d3ec3bab5a 100644
--- a/data/assets/actions/system/undo_event_fades.asset
+++ b/data/assets/actions/system/undo_event_fades.asset
@@ -1,6 +1,6 @@
 local undo_event_fade = {
   Identifier = "os.undo_event_fade",
-  Name = "Undo All Event Fading",
+  Name = "Undo all event fading",
   Command = [[
     openspace.setPropertyValue("Scene.*.Renderable.Fade", 1.0, 0.5);
   ]],
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 b9d74ac2aa..dcc7ccf9ed 100644
--- a/data/assets/actions/trails/on_off_all_minor_moons.asset
+++ b/data/assets/actions/trails/on_off_all_minor_moons.asset
@@ -1,6 +1,6 @@
 local minormoons_on = {
   Identifier = "os_default.minormoons_on",
-  Name = "Turn ON minor moons and trails",
+  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');
@@ -8,14 +8,14 @@ local minormoons_on = {
     local moons = openspace.getProperty('{moon_minor}.Renderable.Enabled');
     local moons_fade = openspace.getProperty('{moon_minor}.Renderable.Fade');
 
-    for i, v in pairs(trails_fade) do 
+    for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
-      openspace.setPropertyValueSingle(v, 1, 2, 'Linear') 
+      openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
     end
 
-    for i, v in pairs(moons_fade) do 
+    for i, v in pairs(moons_fade) do
       openspace.setPropertyValueSingle(moons[i], true)
-      openspace.setPropertyValueSingle(v, 1, 2, 'Linear') 
+      openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
     end
   ]],
   Documentation = "Turn ON minor moons and their trails for all planets in the solar system",
@@ -25,7 +25,7 @@ local minormoons_on = {
 
 local minormoons_off = {
   Identifier = "os_default.minormoons_off",
-  Name = "Turn OFF minor moons and trails",
+  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');
@@ -33,12 +33,12 @@ local minormoons_off = {
     local moons = openspace.getProperty('{moon_minor}.Renderable.Enabled');
     local moons_fade = openspace.getProperty('{moon_minor}.Renderable.Fade');
 
-    for i, v in pairs(trails_fade) do 
-      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" ) 
+    for i, v in pairs(trails_fade) do
+      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" )
     end
 
     for i, v in pairs(moons_fade) do
-      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" ) 
+      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" )
     end
   ]],
   Documentation = "Turn OFF minor moons and their trails for all 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 369f3365cf..7d5333768c 100644
--- a/data/assets/actions/trails/toggle_all_minor_moon_trails.asset
+++ b/data/assets/actions/trails/toggle_all_minor_moon_trails.asset
@@ -1,10 +1,10 @@
 local toggle_minormoon_trails = {
   Identifier = "os_default.toggle_minormoon_trails",
-  Name = "Toggle Minor Moon Trails",
+  Name = "Toggle minor moon trails",
   Command = [[
-    local list = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled'); 
-    for _,v in pairs(list) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) 
+    local list = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled');
+    for _,v in pairs(list) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(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 dbe39e362a..05f09cf8f3 100644
--- a/data/assets/actions/trails/toggle_all_trails.asset
+++ b/data/assets/actions/trails/toggle_all_trails.asset
@@ -1,6 +1,6 @@
 local fade_up_trails = {
   Identifier = "os.fade_up_trails",
-  Name = "Show All Trails",
+  Name = "Show all trails",
   Command = [[
     local capList = openspace.getProperty("Scene.*Trail.Renderable.Fade");
     for _,v in ipairs(capList) do
@@ -19,7 +19,7 @@ asset.export("fade_up_trails", fade_up_trails.Identifier)
 
 local fade_down_trails = {
   Identifier = "os.fade_down_trails",
-  Name = "Hide All Trails",
+  Name = "Hide all trails",
   Command = [[
     local capList = openspace.getProperty("Scene.*Trail.Renderable.Fade");
     for _,v in ipairs(capList) do
@@ -38,7 +38,7 @@ asset.export("fade_down_trails", fade_down_trails.Identifier)
 
 local toggle_trails = {
   Identifier = "os.toggle_trails",
-  Name = "Toggle All Trails",
+  Name = "Toggle all trails",
   Command = [[
     local capList = openspace.getProperty("*Trail.Renderable.Fade");
     local list = openspace.getProperty("*trail.Renderable.Fade");
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 a9bbd70335..5e7e423a4a 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
@@ -1,6 +1,6 @@
 local toggle_trails = {
   Identifier = "os_default.toggle_trails",
-  Name = "Toggle Planet and Moon Trails (Instant)",
+  Name = "Toggle planet and moon trails (instant)",
   Command = [[
     local list = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Enabled");
     for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
diff --git a/data/assets/actions/trails/toggle_trail.asset b/data/assets/actions/trails/toggle_trail.asset
index ab5db95231..0be657b127 100644
--- a/data/assets/actions/trails/toggle_trail.asset
+++ b/data/assets/actions/trails/toggle_trail.asset
@@ -1,6 +1,6 @@
 local toggle_trail = {
   Identifier = "os.toggle_trail",
-  Name = "Toggle Trail",
+  Name = "Toggle trail",
   Command = [[
     local node
     if is_declared("args") then
@@ -48,7 +48,7 @@ asset.export("toggle_trail", toggle_trail.Identifier)
 
 local hide_trail = {
   Identifier = "os.hide_trail",
-  Name = "Hide Trail",
+  Name = "Hide trail",
   Command = [[
     local node
     if is_declared("args") then
@@ -73,7 +73,7 @@ asset.export("hide_trail", hide_trail.Identifier)
 
 local show_trail = {
   Identifier = "os.show_trail",
-  Name = "Show Trail",
+  Name = "Show trail",
   Command = [[
     local node
     if is_declared("args") then
diff --git a/data/assets/actions/trails/toggle_trails_planets_moons.asset b/data/assets/actions/trails/toggle_trails_planets_moons.asset
index 769bb13afa..7d014c710e 100644
--- a/data/assets/actions/trails/toggle_trails_planets_moons.asset
+++ b/data/assets/actions/trails/toggle_trails_planets_moons.asset
@@ -1,6 +1,6 @@
 local fade_up_trails = {
   Identifier = "os.fade_up_trails_planets_moon",
-  Name = "Show Planet and Moon Trails",
+  Name = "Show planet and moon trails",
   Command = [[
     openspace.setPropertyValue("{planetTrail_solarSystem}.Renderable.Fade", 1, 2);
     openspace.setPropertyValue("{moonTrail_solarSystem}.Renderable.Fade", 1, 2);
@@ -13,7 +13,7 @@ asset.export("fade_up_trails", fade_up_trails.Identifier)
 
 local fade_down_trails = {
   Identifier = "os.fade_down_trails_planets_moon",
-  Name = "Hide Planet and Moon Trails",
+  Name = "Hide planet and moon trails",
   Command = [[
     openspace.setPropertyValue("{planetTrail_solarSystem}.Renderable.Fade", 0, 2);
     openspace.setPropertyValue("{moonTrail_solarSystem}.Renderable.Fade", 0, 2);
@@ -26,7 +26,7 @@ asset.export("fade_down_trails", fade_down_trails.Identifier)
 
 local toggle_trails = {
   Identifier = "os.toggle_trails_planets_moon",
-  Name = "Toggle Planet and Moon Trails",
+  Name = "Toggle planet and moon trails",
   Command = [[
     local capList = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Fade");
     local list = openspace.getProperty("{moonTrail_solarSystem}.Renderable.Fade");
diff --git a/data/assets/actions/trails/trail_appearance.asset b/data/assets/actions/trails/trail_appearance.asset
index bf7ec94f80..5e1daa1db0 100644
--- a/data/assets/actions/trails/trail_appearance.asset
+++ b/data/assets/actions/trails/trail_appearance.asset
@@ -1,6 +1,6 @@
 local enable_trail_fading = {
   Identifier = "os.enable_trail_fading",
-  Name = "Enable Trail Fading",
+  Name = "Enable trail fading",
   Command = [[
     openspace.setPropertyValue("Scene.*Trail.Renderable.Appearance.EnableFade", true);
     openspace.setPropertyValue("Scene.*trail.Renderable.Appearance.EnableFade", true);
@@ -13,7 +13,7 @@ asset.export("enable_trail_fading", enable_trail_fading.Identifier)
 
 local disable_trail_fading = {
   Identifier = "os.disable_trail_fading",
-  Name = "Disable Trail Fading",
+  Name = "Disable trail fading",
   Command = [[
     openspace.setPropertyValue("Scene.*Trail.Renderable.Appearance.EnableFade", false);
     openspace.setPropertyValue("Scene.*trail.Renderable.Appearance.EnableFade", false);
@@ -26,7 +26,7 @@ asset.export("disable_trail_fading", disable_trail_fading.Identifier)
 
 local toggle_trail_fading = {
   Identifier = "os.toggle_trail_fading",
-  Name = "Toggle Trail Fading",
+  Name = "Toggle trail fading",
   Command = [[
     local capList = openspace.getProperty("*Trail.Renderable.Appearance.EnableFade")
     local list = openspace.getProperty("*trail.Renderable.Appearance.EnableFade")
@@ -69,7 +69,7 @@ local function getHighlightAction(identifierString, value, nameString)
   end
   local action = {
     Identifier = "os." .. actionString .. identifierString .. "_trail",
-    Name = actionString .. " " .. nameString .. " Trail",
+    Name = actionString .. " " .. nameString .. " trail",
     Command = getHightlightCommand(identifierString, value),
     Documentation = "Animates the trail fade of " .. nameString .. "'s Trail",
     GuiPath = "/Trails/Appearance",
@@ -81,7 +81,7 @@ end
 local function getToggleHighlightAction(identifierString, value, nameString)
   local action = {
     Identifier = "os.toggle_" .. identifierString .. "_trail_highlight",
-    Name = "Toggle " .. nameString .. " Trail Highlight",
+    Name = "Toggle " .. nameString .. " trail highlight",
     Command = [[
 local list = openspace.getProperty("]] .. identifierString .. [[.Renderable.Appearance.Fade");
 if #list == 0 then
diff --git a/data/assets/base.asset b/data/assets/base.asset
index 5d304ca709..341463b15a 100644
--- a/data/assets/base.asset
+++ b/data/assets/base.asset
@@ -57,53 +57,9 @@ asset.require("scene/digitaluniverse/voids")
 asset.require("customization/globebrowsing")
 asset.require("util/default_actions")
 
-local toggle_trails = {
-  Identifier = "os_default.toggle_trails",
-  Name = "Toggle Trails",
-  Command = [[
-    local list = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Enabled");
-    for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
-
-    local moonlist = openspace.getProperty("{moonTrail_solarSystem}.Renderable.Enabled");
-    for _,v in pairs(moonlist) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
-  ]],
-  Documentation = "Toggles the visibility of planet and moon trails",
-  GuiPath = "/Rendering",
-  IsLocal = false,
-
-  Key = "h"
-}
-
-local toggle_planet_labels = {
-  Identifier = "os_default.toggle_planet_labels",
-  Name = "Toggle planet labels",
-  Command = [[
-    local list = openspace.getProperty("{solarsystem_labels}.Renderable.Enabled");
-    for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
-  ]],
-  Documentation = "Turns on visibility for all solar system labels",
-  GuiPath = "/Rendering",
-  IsLocal = false,
-
-  Key = "l"
-}
-
-local trailAction = asset.require("actions/trails/toggle_trails_planets_moons").toggle_trails
 
 asset.onInitialize(function ()
-  openspace.bindKey("h", trailAction.Identifier)
-
-  openspace.action.registerAction(toggle_planet_labels)
-  openspace.bindKey(toggle_planet_labels.Key, toggle_planet_labels.Identifier)
-
   openspace.globebrowsing.loadWMSServersFromFile(
     openspace.absPath("${DATA}/globebrowsing_servers.lua")
   )
 end)
-
-asset.onDeinitialize(function ()
-  openspace.clearKey(toggle_trails.Key)
-
-  openspace.action.removeAction(toggle_planet_labels)
-  openspace.clearKey(toggle_planet_labels.Key)
-end)
diff --git a/data/assets/base_keybindings.asset b/data/assets/base_keybindings.asset
new file mode 100644
index 0000000000..049ede6326
--- /dev/null
+++ b/data/assets/base_keybindings.asset
@@ -0,0 +1,30 @@
+asset.require("./base")
+
+local trailAction = asset.require("actions/trails/toggle_trails_planets_moons").toggle_trails
+
+local toggle_planet_labels = {
+  Identifier = "os_default.toggle_planet_labels",
+  Name = "Toggle planet labels",
+  Command = [[
+    local list = openspace.getProperty("{solarsystem_labels}.Renderable.Enabled");
+    for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
+  ]],
+  Documentation = "Turns on visibility for all solar system labels",
+  GuiPath = "/Solar System",
+  IsLocal = false,
+  Key = "l"
+}
+
+asset.onInitialize(function ()
+  openspace.action.registerAction(toggle_planet_labels)
+  openspace.bindKey(toggle_planet_labels.Key, toggle_planet_labels.Identifier)
+
+  openspace.bindKey("h", trailAction.Identifier)
+end)
+
+asset.onDeinitialize(function ()
+  openspace.clearKey("h")
+
+  openspace.action.removeAction(toggle_planet_labels)
+  openspace.clearKey(toggle_planet_labels.Key)
+end)
diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset
index 1e74a9cb64..7aecfac6bb 100644
--- a/data/assets/customization/globebrowsing.asset
+++ b/data/assets/customization/globebrowsing.asset
@@ -23,7 +23,7 @@ local vrt_folders = {
     -- if areas overlap (for example CTX and HiRISE) and CTX is specified *after* HiRISE,
     -- CTX will stomp over the HiRISE.
 
-    -- tl;dr:  Specify CTX folders first, then HiRISE 
+    -- tl;dr:  Specify CTX folders first, then HiRISE
     -- example:   "C:/OpenSpace/GlobeBrowsingData/Mars/CTX"
 
     -- We recommend using this folder for CTX
diff --git a/data/assets/educational/scale/eiffeltower.asset b/data/assets/educational/scale/eiffeltower.asset
index 097da8f3b5..9b16c63579 100644
--- a/data/assets/educational/scale/eiffeltower.asset
+++ b/data/assets/educational/scale/eiffeltower.asset
@@ -48,7 +48,7 @@ local eiffelTower = {
 
 local updatePositionAction = {
   Identifier = "os.drop_eiffel_tower",
-  Name = "Drop Eiffel Tower under camera",
+  Name = "Drop Eiffel tower under camera",
   Command = [[
     local lat, lon, alt = openspace.globebrowsing.getGeoPositionForCamera();
     local camera = openspace.navigation.getNavigationState();
@@ -67,7 +67,7 @@ local updatePositionAction = {
 
 local resetPositionAction = {
   Identifier = "os.reset_eiffel_tower",
-  Name = "Reset Eiffel Tower position",
+  Name = "Reset Eiffel tower position",
   Command = [[
     -- same position as above
     local lat = 48.85824
diff --git a/data/assets/events/toggle_sun.asset b/data/assets/events/toggle_sun.asset
index 8d727273ec..1af8f1eaff 100644
--- a/data/assets/events/toggle_sun.asset
+++ b/data/assets/events/toggle_sun.asset
@@ -19,7 +19,7 @@ local toggle_sun = {
       openspace.setPropertyValueSingle("Scene.Sun.Renderable.Fade", 0.0, 1.0)
     end
   ]],
-  Documentation = [[Toggles the visibility of the Sun glare and the Sun globe when the 
+  Documentation = [[Toggles the visibility of the Sun glare and the Sun globe when the
     camera is approaching either so that from far away the Sun Glare is rendered and when
     close up, the globe is rendered instead]],
   GuiPath = "/Solar System/Sun",
diff --git a/data/assets/examples/approachevents.asset b/data/assets/examples/approachevents.asset
index 821a40e6e3..54291995a2 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 generic_action = {
   Identifier = "os.example.generic",
-  Name = "Generic Example",
+  Name = "Generic example",
   Command = [[
     openspace.printInfo("Node: " .. args.Node)
     openspace.printInfo("Transition: " .. args.Transition)
diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
index 42776124b9..edb004c892 100644
--- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset
+++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
@@ -11,6 +11,7 @@ local object = {
     Type = "RenderableBillboardsCloud",
     Enabled = false,
     Labels = {
+      Enabled = true,
       File = speck .. "stars-altlbl.label",
       Color = { 0.4, 0.4, 0.4 },
       Size = 14.7,
@@ -19,8 +20,7 @@ local object = {
     },
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
-    Unit = "pc",
-    DrawLabels = true
+    Unit = "pc"
   },
   GUI = {
     Name = "Stars Labels - Alternate",
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset
index 4b6c8f00e2..5605f16bad 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset
@@ -29,7 +29,6 @@ local wmap = {
     Texture = textures .. "wmap_ilc_7yr_v4_200uK_RGB_sos.png",
     Orientation = "Both",
     MirrorTexture = true,
-    RenderBinMode = "PreDeferredTransparent",
     FadeInThreshold = 0.4
   },
   GUI = {
@@ -55,7 +54,6 @@ local cbe = {
     Texture = textures .. "COBErect.png",
     Orientation = "Both",
     MirrorTexture = true,
-    RenderBinMode = "PreDeferredTransparent",
     FadeInThreshold = 0.4
   },
   GUI = {
@@ -81,7 +79,6 @@ local planck = {
     Texture = textures .. "cmb4k.jpg",
     Orientation = "Both",
     MirrorTexture = true,
-    RenderBinMode = "PreDeferredTransparent",
     FadeInThreshold = 0.4
   },
   GUI = {
@@ -107,7 +104,6 @@ local Halpha = {
     Opacity = 0.4,
     Texture = textures .. "mwHalpha-f.png",
     Orientation = "Inside",
-    RenderBinMode = "PreDeferredTransparent",
     MirrorTexture = true,
     FadeOutThreshold = 0.025,
     Background = true
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
index 736a1e416e..9015923568 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
@@ -26,7 +26,6 @@ local multiverse_planck_1 = {
     Texture = textures .. "cmb4k.jpg",
     Orientation = "Both",
     MirrorTexture = true,
-    RenderBinMode = "PreDeferredTransparent",
     FadeInThreshold = 0.4
   },
   GUI = {
@@ -56,7 +55,6 @@ local multiverse_planck_2 = {
     Texture = textures .. "cmb4k.jpg",
     Orientation = "Both",
     MirrorTexture = true,
-    RenderBinMode = "PreDeferredTransparent",
     FadeInThreshold = 0.4
   },
   GUI = {
@@ -86,7 +84,6 @@ local multiverse_planck_3 = {
     Texture = textures .. "cmb4k.jpg",
     Orientation = "Both",
     MirrorTexture = true,
-    RenderBinMode = "PreDeferredTransparent",
     FadeInThreshold = 0.4
   },
   GUI = {
@@ -116,7 +113,6 @@ local multiverse_planck_4 = {
     Texture = textures .. "cmb4k.jpg",
     Orientation = "Both",
     MirrorTexture = true,
-    RenderBinMode = "PreDeferredTransparent",
     FadeInThreshold = 0.4
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset
index 57aa7a429c..8c50d45189 100644
--- a/data/assets/scene/digitaluniverse/clusters.asset
+++ b/data/assets/scene/digitaluniverse/clusters.asset
@@ -11,6 +11,7 @@ local object = {
     Type = "RenderableBillboardsCloud",
     Enabled = false,
     Labels = {
+      Enabled = true,
       File = speck .. "galclust.label",
       Color = { 1.0, 0.44, 0.0 },
       Size = 22,
@@ -20,13 +21,12 @@ local object = {
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     Unit = "Mpc",
-    DrawLabels = true,
     TransformationMatrix = {
       -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
-    },
+    }
   },
   GUI = {
     Name = "Galaxy Cluster Labels",
diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset
index 97ae62244f..c66dac3cf9 100644
--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -7,12 +7,26 @@ local equatorialRotationMatrix = {
   -0.483835  ,  0.7469823,  0.4559838
 }
 
+local equatorialTransformationMatrix = {
+  -0.05487554,  0.4941095, -0.8676661, 0.0,
+  -0.8734371 , -0.4448296, -0.1980764, 0.0,
+  -0.483835  ,  0.7469823,  0.4559838, 0.0,
+   0.0       ,  0.0      ,  0.0      , 1.0
+}
+
 local eclipticRotationMatrix = {
   -0.05487554,  0.4941095, -0.8676661,
   -0.9938214 , -0.1109906, -0.0003515167,
   -0.09647644,  0.8622859,  0.4971472
 }
 
+local eclipticTransformationMatrix = {
+  -0.05487554,  0.4941095, -0.8676661,    0.0,
+  -0.9938214 , -0.1109906, -0.0003515167, 0.0,
+  -0.09647644,  0.8622859,  0.4971472,    0.0,
+   0.0       ,  0.0      ,  0.0      ,    1.0
+}
+
 local speck = asset.syncedResource({
   Name = "Grids Speck Files",
   Type = "HttpSynchronization",
@@ -112,22 +126,18 @@ local eclipticLabels = {
     Type = "RenderableBillboardsCloud",
     Enabled = false,
     Labels = {
+      Enabled = true,
       File = speck .. "eclip.label",
       Color = { 0.5, 0.5, 0.5 },
       Size = 14.75,
       MinMaxSize = { 1, 50 },
-      Unit = "pc"
+      Unit = "pc",
+      TransformationMatrix = eclipticTransformationMatrix
     },
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     Unit = "pc",
-    DrawLabels = true,
-    TransformationMatrix = {
-      -0.05487554,  0.4941095, -0.8676661,    0.0,
-      -0.9938214 , -0.1109906, -0.0003515167, 0.0,
-      -0.09647644,  0.8622859,  0.4971472,    0.0,
-      0.0,          0.0,        0.0,          1.0
-    }
+    TransformationMatrix = eclipticTransformationMatrix
   },
   GUI = {
     Name = "Ecliptic Sphere Labels",
@@ -168,22 +178,18 @@ local equatorialLabels = {
     Type = "RenderableBillboardsCloud",
     Enabled = false,
     Labels = {
+      Enabled = true,
       File = speck .. "radec.label",
       Color = { 0.5, 0.5, 0.5 },
       Size = 14.5,
       MinMaxSize = { 2, 70 },
-      Unit = "pc"
+      Unit = "pc",
+      TransformationMatrix = equatorialTransformationMatrix
     },
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     Unit = "pc",
-    DrawLabels = true,
-    TransformationMatrix = {
-      -0.05487554,  0.4941095, -0.8676661, 0.0,
-      -0.8734371 , -0.4448296, -0.1980764, 0.0,
-      -0.483835  ,  0.7469823,  0.4559838, 0.0,
-        0.0       ,  0.0      ,  0.0      , 1.0
-    }
+    TransformationMatrix = equatorialTransformationMatrix
   },
   GUI = {
     Name = "Equatorial Sphere Labels",
@@ -220,6 +226,7 @@ local galacticLabels = {
     Type = "RenderableBillboardsCloud",
     Enabled = false,
     Labels = {
+      Enabled = true,
       File = speck .. "galac.label",
       Color = { 0.5, 0.5, 0.5 },
       Size = 15.8,
@@ -228,8 +235,7 @@ local galacticLabels = {
     },
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
-    Unit = "pc",
-    DrawLabels = true
+    Unit = "pc"
   },
   GUI = {
     Name = "Galactic Sphere Labels",
diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset
index 1cd3e928f8..0faa4b57e9 100644
--- a/data/assets/scene/digitaluniverse/groups.asset
+++ b/data/assets/scene/digitaluniverse/groups.asset
@@ -11,6 +11,7 @@ local object = {
     Type = "RenderableBillboardsCloud",
     Enabled = false,
     Labels = {
+      Enabled = true,
       File = speck .. "groups.label",
       Color = { 0.1, 0.6, 0.2 },
       Size = 21.5,
@@ -21,7 +22,6 @@ local object = {
     Opacity = 0.65,
     --ScaleFactor = 10.0,
     Unit = "Mpc",
-    DrawLabels = true,
     TransformationMatrix = {
       -0.7357425748,    0.67726129641,  0.0,           0.0,
       -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset
index f6501a647f..da61a3a946 100644
--- a/data/assets/scene/digitaluniverse/milkyway_label.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_label.asset
@@ -11,6 +11,7 @@ local homeLabel = {
     Type = "RenderableBillboardsCloud",
     Enabled = false,
     Labels = {
+      Enabled = true,
       File = homespeck .. "home.label",
       Color = { 0.8, 0.8, 0.8 },
       Size = 20.50,
@@ -20,7 +21,6 @@ local homeLabel = {
     Color = { 1.0, 0.4, 0.2 },
     Opacity = 0.99,
     ScaleFactor = 500.0,
-    DrawLabels = true,
     Unit = "Mpc",
     TransformationMatrix = {
       -0.7357425748,    0.67726129641,  0.0,           0.0,
diff --git a/data/assets/scene/digitaluniverse/milkyway_sphere.asset b/data/assets/scene/digitaluniverse/milkyway_sphere.asset
index 2cde64e74a..9094724bd9 100644
--- a/data/assets/scene/digitaluniverse/milkyway_sphere.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_sphere.asset
@@ -21,7 +21,6 @@ local sphere = {
     Opacity = 0.35,
     Texture = sphereTextures .. "DarkUniverse_mellinger_4k.jpg",
     Orientation = "Inside",
-    RenderBinMode = "PreDeferredTransparent",
     MirrorTexture = true,
     FadeOutThreshold = 0.0015,
     Background = true,
diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset
index 8543b5a6d6..92f511c9cf 100644
--- a/data/assets/scene/digitaluniverse/starlabels.asset
+++ b/data/assets/scene/digitaluniverse/starlabels.asset
@@ -11,6 +11,7 @@ local object = {
     Type = "RenderableBillboardsCloud",
     Enabled = false,
     Labels = {
+      Enabled = true,
       File = speck .. "stars.label",
       Color = { 0.4, 0.4, 0.4 },
       Size = 14.7,
@@ -19,8 +20,7 @@ local object = {
     },
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
-    Unit = "pc",
-    DrawLabels = true
+    Unit = "pc"
   },
   GUI = {
     Name = "Stars Labels",
diff --git a/data/assets/scene/digitaluniverse/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset
index d23aa45a40..e5d1cbcfe7 100644
--- a/data/assets/scene/digitaluniverse/starorbits.asset
+++ b/data/assets/scene/digitaluniverse/starorbits.asset
@@ -191,7 +191,7 @@ asset.meta = {
   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 
+    Lacaille 9352, LSR1826+3014, LSRJ0822+1700, PM_J13420-3415. <br><br> Data
     Reference: Sebastien Lepine (AMNH)]],
   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 375128e9d1..1943c1f216 100644
--- a/data/assets/scene/digitaluniverse/superclusters.asset
+++ b/data/assets/scene/digitaluniverse/superclusters.asset
@@ -18,6 +18,7 @@ local object = {
     Type = "RenderableBillboardsCloud",
     Enabled = false,
     Labels = {
+      Enabled = true,
       File = speck .. "superclust.label",
       Color = { 0.9, 0.9, 0.9 },
       Size = 22.44,
@@ -31,7 +32,6 @@ local object = {
     Texture = textures .. "point3A.png",
     Unit = "Mpc",
     ScaleFactor = 531.0,
-    DrawLabels = true,
     -- BillboardMinMaxSize = { 0.0, 7.2 },
     EnablePixelSizeControl = true
   },
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index 96521ba5f2..26ec295dc7 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -34,7 +34,6 @@ local tullyPoints = {
     --ColorOption = { "proximity" },
     ColorOption = { "prox5Mpc" },
     ColorRange = { { 1.0, 30.0 } },
-    DrawLabels = false,
     Unit = "Mpc",
     TransformationMatrix = {
       -0.7357425748,    0.67726129641,  0.0,           0.0,
diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset
index f380b05e32..6a97959b86 100644
--- a/data/assets/scene/digitaluniverse/voids.asset
+++ b/data/assets/scene/digitaluniverse/voids.asset
@@ -11,6 +11,7 @@ local object = {
     Type = "RenderableBillboardsCloud",
     Enabled = false,
     Labels = {
+      Enabled = true,
       File = speck .. "voids.label",
       Color = { 0.296, 0.629, 1.0 },
       Size = 20.9,
@@ -18,7 +19,6 @@ local object = {
       Unit = "Mpc"
     },
     DrawElements = false,
-    DrawLabels = true,
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     Unit = "Mpc"
diff --git a/data/assets/scene/milkyway/constellations/constellation_art.asset b/data/assets/scene/milkyway/constellations/constellation_art.asset
index 0bf65abd00..a83d44f5ed 100644
--- a/data/assets/scene/milkyway/constellations/constellation_art.asset
+++ b/data/assets/scene/milkyway/constellations/constellation_art.asset
@@ -124,7 +124,7 @@ end
 
 local show_art = {
   Identifier = "constellation_art.show_art",
-  Name = "Show Constellation Art",
+  Name = "Show constellation art",
   Command = [[
     openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Opacity", 0);
     openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Enabled", true);
@@ -138,7 +138,7 @@ asset.export("ShowArtAction", show_art)
 
 local hide_art = {
   Identifier = "constellation_art.hide_art",
-  Name = "Hide Constellation Art",
+  Name = "Hide constellation art",
   Command = [[openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Opacity", 0, 2)]],
   Documentation = "Fades out constellation artwork",
   GuiPath = "/Rendering",
@@ -148,7 +148,7 @@ asset.export("HideArtAction", hide_art)
 
 local disable_art = {
   Identifier = "constellation_art.disable_art",
-  Name = "Disable Constellation Art",
+  Name = "Disable constellation art",
   Command = [[openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Enabled", false)]],
   Documentation = "Disable constellation artwork",
   GuiPath = "/Rendering",
@@ -158,7 +158,7 @@ asset.export("DisableArtAction", disable_art)
 
 local show_zodiac_art = {
   Identifier = "constellation_art.show_zodiac_art",
-  Name = "Show Zodiac Art",
+  Name = "Show zodiac art",
   Command = [[
     openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Opacity", 0);
     openspace.setPropertyValue("{zodiac}.Renderable.Enabled",true);
@@ -172,7 +172,7 @@ asset.export("ShowZodiacArt", show_zodiac_art)
 
 local hide_zodiac_art = {
   Identifier = "constellation_art.hide_zodiac_art",
-  Name = "Hide Zodiac Art",
+  Name = "Hide zodiac art",
   Command =  [[openspace.setPropertyValue("{zodiac}.Renderable.Opacity", 0, 2)]],
   Documentation = "fades down zodiac art work",
   GuiPath = "/Rendering",
diff --git a/data/assets/scene/milkyway/milkyway/eso.asset b/data/assets/scene/milkyway/milkyway/eso.asset
index 190fa46693..0276fea594 100644
--- a/data/assets/scene/milkyway/milkyway/eso.asset
+++ b/data/assets/scene/milkyway/milkyway/eso.asset
@@ -19,7 +19,6 @@ local object = {
     Segments = 40,
     Opacity = 0.4,
     Texture = textures .. "eso0932a_blend.png",
-    RenderBinMode = "PreDeferredTransparent",
     Orientation = "Inside",
     MirrorTexture = true,
     FadeOutThreshold = 0.01,
@@ -48,7 +47,7 @@ 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 
+  Description = [[This asset contains an alternate to the Digital Universe image for the
     Milky Way from ESO]],
   Author = "ESO/S. Brunier",
   URL = "https://www.eso.org/public/usa/images/eso0932a/",
diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
index e507f89499..f5e2c760c4 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
@@ -36,16 +36,16 @@ local OrionClusterStars = {
     Path = "/Milky Way/Orion",
     Description = [[In order to have an accurate depiction of the Orion nebula, we
       need to include the star cluster that was birthed from it. We turned to a study of the
-      cluster's stellar population by Lynne Hillenbrand, who was working at the University of 
-      California, Berkeley at the time. The catalog from her paper contains more than 1500 
-      stars, about half the stars in the actual cluster. The cluster is very crowded, with a 
-      peak density of 10000 stars per cubic parsec over a wide range of masses from a tenth the 
-      sun's mass up to 50 times its mass. We were presented with one problem: there are no 
-      distances. For the stellar distances, we needed to deduce them by statistical methods. 
-      Knowing the size of the cluster and approximating the shape to be roughly spherical, we 
-      placed each star along a line of sight through this imaginary sphere centered on the 
-      cluster. In this sense, these data are observed data and the view from Earth is accurate. 
-      But the distance of each star has been derived from this educated-guess approach for the 
+      cluster's stellar population by Lynne Hillenbrand, who was working at the University of
+      California, Berkeley at the time. The catalog from her paper contains more than 1500
+      stars, about half the stars in the actual cluster. The cluster is very crowded, with a
+      peak density of 10000 stars per cubic parsec over a wide range of masses from a tenth the
+      sun's mass up to 50 times its mass. We were presented with one problem: there are no
+      distances. For the stellar distances, we needed to deduce them by statistical methods.
+      Knowing the size of the cluster and approximating the shape to be roughly spherical, we
+      placed each star along a line of sight through this imaginary sphere centered on the
+      cluster. In this sense, these data are observed data and the view from Earth is accurate.
+      But the distance of each star has been derived from this educated-guess approach for the
       cluster distribution]]
   }
 }
diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
index 74f785af05..e2dc3d5551 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
@@ -28,18 +28,18 @@ local NebulaHolder = {
   GUI = {
     Name = "Orion Nebula",
     Path = "/Milky Way/Orion",
-    Description = [[In the Digital Universe model of the Orion Nebula, we depict the 
-      ionization front effectively as a terrain, with a flat Hubble image of the nebula mapped 
+    Description = [[In the Digital Universe model of the Orion Nebula, we depict the
+      ionization front effectively as a terrain, with a flat Hubble image of the nebula mapped
       on the undulating surface. In reality, the ionization front has a slight thickness to
-      it - about a third of a light year - but is quite thin compared to the overall size of 
-      the nebula, which stretches about ten light years from side to side.<br><br>Close into 
-      the center, we see small teardrop-shaped structures with their narrow ends pointing away 
-      from the bright star: these are protoplanetary disks, or proplyds, of dense gas and dust 
-      surrounding young stars. The larger formations that one sees farther away from the center 
-      of the nebula take on a cup-like shape, with the narrow end pointing away from the 
-      nebulas center. These enormous structures are bow shocks that delineate the region where 
-      highspeed winds from the central star slow from supersonic to subsonic speeds. You can 
-      think of an HII region as a sort of tremendous explosion, taking place over millennia, 
+      it - about a third of a light year - but is quite thin compared to the overall size of
+      the nebula, which stretches about ten light years from side to side.<br><br>Close into
+      the center, we see small teardrop-shaped structures with their narrow ends pointing away
+      from the bright star: these are protoplanetary disks, or proplyds, of dense gas and dust
+      surrounding young stars. The larger formations that one sees farther away from the center
+      of the nebula take on a cup-like shape, with the narrow end pointing away from the
+      nebulas center. These enormous structures are bow shocks that delineate the region where
+      highspeed winds from the central star slow from supersonic to subsonic speeds. You can
+      think of an HII region as a sort of tremendous explosion, taking place over millennia,
       and the bow shocks are part of the outward rush of material]]
   }
 }
diff --git a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
index cfae12d725..14fbe8ff1f 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
@@ -49,7 +49,7 @@ local fieldlines = {
 
 local toggle_fieldlines = {
   Identifier = "os.events.bastilleday.fieldlines.togglefieldlines",
-  Name = "Toggle Fieldlines",
+  Name = "Toggle fieldlines",
   Command = propertyHelper.invert("Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Enabled"),
   Documentation = "Toggle fieldline rendering of CME",
   GuiPath = "/Bastille-Day 2000",
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 20ee5a17a8..a86ea5eccd 100644
--- a/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
+++ b/data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
@@ -61,7 +61,7 @@ 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 
+  it provides an action to cycle through the textures. See magnetogram.asset for details
   of the textures]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/apollo/11/actions.asset b/data/assets/scene/solarsystem/missions/apollo/11/actions.asset
index e8c5fd8ef9..cbdff22025 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/actions.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/actions.asset
@@ -4,13 +4,13 @@ local apollo11_setup_landingsite = {
     Identifier = "os.missions.apollo11.setup.landingsite",
     Name = "Setup Apollo 11 landing site",
     Command = [[
-      openspace.time.setTime('1969 JUL 20 20:17:40'); 
-      openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_11.Enabled', true); 
-      openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A11_M177481212_p_longlat.Enabled', true); 
-      openspace.setPropertyValueSingle('Scene.Moon.Renderable.TargetLodScaleFactor', 20.11); 
-      openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Apollo11LemPosition'); 
-      openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil); 
-      openspace.setPropertyValueSingle('Scene.Apollo11MoonTrail.Renderable.Enabled', true); 
+      openspace.time.setTime('1969 JUL 20 20:17:40');
+      openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_11.Enabled', true);
+      openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A11_M177481212_p_longlat.Enabled', true);
+      openspace.setPropertyValueSingle('Scene.Moon.Renderable.TargetLodScaleFactor', 20.11);
+      openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Apollo11LemPosition');
+      openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
+      openspace.setPropertyValueSingle('Scene.Apollo11MoonTrail.Renderable.Enabled', true);
       openspace.setPropertyValueSingle('Scene.Apollo11LemTrail.Renderable.Enabled', true);
     ]],
     Documentation = "Setup for Apollo 11 landing site",
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 3172e6c417..4e94a13036 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset
@@ -23,7 +23,7 @@ asset.onInitialize(function ()
   rawset(_G, "nextFlip", function() helper.nextFlipbookPage(flipbook) end)
   openspace.action.registerAction({
     Identifier = "lem_flipbook.next_flip",
-    Name = "Next A11 flip",
+    Name = "Next Apollo 11 flip",
     Command = "nextFlip()",
     Documentation = "Show the next Apollo 11 flipbook image",
     GuiPath = "/Missions/Apollo/11",
@@ -33,7 +33,7 @@ asset.onInitialize(function ()
   rawset(_G, "previousFlip", function() helper.previousFlipbookPage(flipbook) end)
   openspace.action.registerAction({
     Identifier = "lem_flipbook.prev_flip",
-    Name = "Prev A11 flip",
+    Name = "Prev Apollo 11 flip",
     Command = "previousFlip()",
     Documentation = "Show the previous Apollo 11 flipbook image",
     GuiPath = "/Missions/Apollo/11",
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/actions.asset b/data/assets/scene/solarsystem/missions/apollo/17/actions.asset
index 40fcfc2ae9..591364b1b2 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/actions.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/actions.asset
@@ -4,17 +4,17 @@ local apollo17_setup_landingsite = {
   Identifier = "os.missions.apollo17.setup.landingsite",
   Name = "Setup for Apollo 17 landing site",
   Command = [[
-    openspace.time.setTime('1972 DEC 12 19:47:11'); 
-    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_travmap.BlendMode', 0.000000); 
-    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_travmap.Enabled', true); 
-    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_17.Enabled', true); 
-    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_LEM.Enabled', true); 
-    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_LEM.BlendMode', 0.000000); 
-    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_NAC_Alt_p.Enabled', true); 
+    openspace.time.setTime('1972 DEC 12 19:47:11');
+    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_travmap.BlendMode', 0.000000);
+    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_travmap.Enabled', true);
+    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_17.Enabled', true);
+    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_LEM.Enabled', true);
+    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_LEM.BlendMode', 0.000000);
+    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_NAC_Alt_p.Enabled', true);
     openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_NAC_Alt_p.BlendMode', 0.000000);
-    openspace.setPropertyValueSingle('Scene.Moon.Renderable.TargetLodScaleFactor', 20.17); 
-    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Apollo17LemModel'); 
-    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil); 
+    openspace.setPropertyValueSingle('Scene.Moon.Renderable.TargetLodScaleFactor', 20.17);
+    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Apollo17LemModel');
+    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
     openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_station7.BlendMode', 0.000000);
   ]],
   Documentation = "Setup for Apollo 17 landing site",
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/actions.asset b/data/assets/scene/solarsystem/missions/apollo/8/actions.asset
index cd66969245..49c5458da8 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/actions.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/actions.asset
@@ -2,10 +2,10 @@ local apollo8_setup_earthrise = {
   Identifier = "os.missions.apollo8.setup.earthrise",
   Name = "Set Earthrise time",
   Command = [[
-    openspace.time.setPause(true); 
-    openspace.time.setDeltaTime(1); 
-    openspace.time.setTime('1968 DEC 24 16:37:31'); 
-    openspace.navigation.setNavigationState({Anchor = 'Apollo8', Position = { 1.494592E1, 3.236777E1, -4.171296E1 }, ReferenceFrame = 'Root', Up = { 0.960608E0, -0.212013E0, 0.179675E0 }}); 
+    openspace.time.setPause(true);
+    openspace.time.setDeltaTime(1);
+    openspace.time.setTime('1968 DEC 24 16:37:31');
+    openspace.navigation.setNavigationState({Anchor = 'Apollo8', Position = { 1.494592E1, 3.236777E1, -4.171296E1 }, ReferenceFrame = 'Root', Up = { 0.960608E0, -0.212013E0, 0.179675E0 }});
     openspace.setPropertyValue('*Trail.Renderable.Enabled', false);
   ]],
   Documentation = "Jump to right before the earthrise photo",
@@ -17,7 +17,7 @@ local apollo8_setup_launch = {
   Identifier = "os.missions.apollo8.setup.launch",
   Name = "Set Apollo 8 launch time",
   Command = [[
-    openspace.time.setTime('1968-12-21T12:51:37.00'); 
+    openspace.time.setTime('1968-12-21T12:51:37.00');
     openspace.setPropertyValueSingle('Scene.Apollo8LaunchTrail.Renderable.Enabled', true);
   ]],
   Documentation = "Jump to time right before Apollo 8 liftoff, with its trail enabled",
diff --git a/data/assets/scene/solarsystem/missions/apollo/actions.asset b/data/assets/scene/solarsystem/missions/apollo/actions.asset
index 6bd483a6c1..2b2c1d9c7f 100644
--- a/data/assets/scene/solarsystem/missions/apollo/actions.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/actions.asset
@@ -13,8 +13,8 @@ local focus_moon = {
   Identifier = "os.missions.apollo.moon.focus",
   Name = "Focus on Moon",
   Command = [[
-    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', ''); 
-    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Moon'); 
+    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');
+    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Moon');
     openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
   ]],
   Documentation = "Set camera focus on the Moon",
@@ -26,8 +26,8 @@ local focus_earth = {
   Identifier = "os.missions.apollo.earth.focus",
   Name = "Focus on Earth",
   Command = [[
-    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', ''); 
-    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth'); 
+    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');
+    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth');
     openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
   ]],
   Documentation = "Set camera focus on the Earth",
@@ -38,7 +38,7 @@ local focus_earth = {
 asset.onInitialize(function()
   openspace.action.registerAction(toggle_moon_shading)
   openspace.action.registerAction(focus_moon)
-  openspace.action.registerAction(focus_earth)  
+  openspace.action.registerAction(focus_earth)
 end)
 
 asset.onDeinitialize(function()
diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
index 682462e3b1..e7a765c55a 100644
--- a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
@@ -44,17 +44,17 @@ local apollo_moon_disableapollosites= {
   Identifier = "os.missions.apollo.moon.disableapollosites",
   Name = "Disable Apollo sites",
   Command = [[
-    openspace.setPropertyValue('Scene.Moon.Renderable.Layers.ColorLayers.A17_*.Enabled', false); 
-    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_11.Enabled', false); 
-    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A11_M177481212_p_longlat.Enabled', false); 
-    openspace.setPropertyValueSingle('Scene.Apollo11MoonTrail.Renderable.Enabled', false); 
-    openspace.setPropertyValueSingle('Scene.Apollo11LemTrail.Renderable.Enabled', false); 
+    openspace.setPropertyValue('Scene.Moon.Renderable.Layers.ColorLayers.A17_*.Enabled', false);
+    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_11.Enabled', false);
+    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A11_M177481212_p_longlat.Enabled', false);
+    openspace.setPropertyValueSingle('Scene.Apollo11MoonTrail.Renderable.Enabled', false);
+    openspace.setPropertyValueSingle('Scene.Apollo11LemTrail.Renderable.Enabled', false);
     openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_17.Enabled', false);
   ]],
   Documentation = "Disable apollo site on moon when leaving",
   GuiPath = "/Missions/Apollo",
   IsLocal = false
-} 
+}
 
 asset.onInitialize(function ()
   openspace.globebrowsing.addBlendingLayersFromDirectory(heightmaps, moon_transforms.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 291eb01e04..71b3372e23 100644
--- a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
@@ -85,7 +85,7 @@ end
 
 local show_apollo_labels = {
   Identifier = "apollo_insignias.show_insignias",
-  Name = "Show Apollo Landing Labels",
+  Name = "Show Apollo landing labels",
   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",
@@ -94,7 +94,7 @@ local show_apollo_labels = {
 
 local hide_apollo_labels = {
   Identifier = "apollo_insignias.hide_insignias",
-  Name = "Hide Apollo Landing Labels",
+  Name = "Hide Apollo landing labels",
   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",
diff --git a/data/assets/scene/solarsystem/missions/insight/shortcuts.asset b/data/assets/scene/solarsystem/missions/insight/shortcuts.asset
index a310541b24..19faef8f1b 100644
--- a/data/assets/scene/solarsystem/missions/insight/shortcuts.asset
+++ b/data/assets/scene/solarsystem/missions/insight/shortcuts.asset
@@ -16,7 +16,7 @@ local insightNavigationState = [[
 local Shortcuts = {
   {
     Command = [[
-      openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset", -469.300000); 
+      openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset", -469.300000);
       openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset", -470.800006);
     ]],
     Documentation = "Enable Insight landing height layer offset",
@@ -26,7 +26,7 @@ local Shortcuts = {
   },
   {
     Command = [[
-      openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset", 0); 
+      openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset", 0);
       openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset", 0);
     ]],
     Documentation = "Disable Insight landing height layer offset",
diff --git a/data/assets/scene/solarsystem/missions/juice/kernels.asset b/data/assets/scene/solarsystem/missions/juice/kernels.asset
index 7a12b5f7fe..92f7dec8a2 100644
--- a/data/assets/scene/solarsystem/missions/juice/kernels.asset
+++ b/data/assets/scene/solarsystem/missions/juice/kernels.asset
@@ -76,7 +76,7 @@ asset.meta = {
   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 
+    GPHIO kernel provided by Ronan Modolo for the fieldline and plane data visualization
   ]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/missions/juice/plane.asset b/data/assets/scene/solarsystem/missions/juice/plane.asset
index 019a3835b3..4aa731e5f0 100644
--- a/data/assets/scene/solarsystem/missions/juice/plane.asset
+++ b/data/assets/scene/solarsystem/missions/juice/plane.asset
@@ -58,7 +58,7 @@ local xy_u = {
   GUI = {
     Name = "Ganymede XY Plane U",
     Path = "/Solar System/Missions/Juice/Plane",
-    Description = [[A cut plane in Ganymede's XY plane showing the strength of the 
+    Description = [[A cut plane in Ganymede's XY plane showing the strength of the
       magnetic field]]
   }
 }
@@ -193,7 +193,7 @@ local xz_u = {
   GUI = {
     Name = "Ganymede XZ Plane U",
     Path = "/Solar System/Missions/Juice/Plane",
-    Description = [[A cut plane in Ganymede's XZ plane showing the strength of the 
+    Description = [[A cut plane in Ganymede's XZ plane showing the strength of the
       magnetic field]]
   }
 }
diff --git a/data/assets/scene/solarsystem/missions/juno/juno.asset b/data/assets/scene/solarsystem/missions/juno/juno.asset
index 70f8360658..77319d3580 100644
--- a/data/assets/scene/solarsystem/missions/juno/juno.asset
+++ b/data/assets/scene/solarsystem/missions/juno/juno.asset
@@ -198,11 +198,11 @@ asset.onInitialize(function()
   openspace.addSceneGraphNode(Juno)
   openspace.addSceneGraphNode(JunoTrail)
 end)
-    
+
 asset.onDeinitialize(function()
   openspace.removeSceneGraphNode(JunoTrail)
   openspace.removeSceneGraphNode(Juno)
 end)
-    
+
 asset.export(Juno)
 asset.export(JunoTrail)
diff --git a/data/assets/scene/solarsystem/missions/jwst/actions.asset b/data/assets/scene/solarsystem/missions/jwst/actions.asset
index e7b967a07e..648a47343e 100644
--- a/data/assets/scene/solarsystem/missions/jwst/actions.asset
+++ b/data/assets/scene/solarsystem/missions/jwst/actions.asset
@@ -2,9 +2,9 @@ local toggle_lagrangian_points = {
   Identifier = "os.missions.jwst.togglelagrangianpoints",
   Name = "Toggle Lagrangian points",
   Command = [[
-    local list = openspace.getProperty('{lagrange_points_earth}.Renderable.Enabled'); 
-    for _,v in pairs(list) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) 
+    local list = openspace.getProperty('{lagrange_points_earth}.Renderable.Enabled');
+    for _,v in pairs(list) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
     end
   ]],
   Documentation = "Toggle points and labels for the Lagrangian points for Earth Sun system",
@@ -16,9 +16,9 @@ local toggle_hudf = {
   Identifier = "os.missions.jwst.togglehudf",
   Name = "Toggle Hubble Ultra Deep Field",
   Command = [[
-    local list = openspace.getProperty('{mission_jwst_hudf}.*.Enabled'); 
-    for _,v in pairs(list) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) 
+    local list = openspace.getProperty('{mission_jwst_hudf}.*.Enabled');
+    for _,v in pairs(list) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
     end
   ]],
   Documentation = "Toggle Hubble Ultra Deep Field image and line towards its coordinate",
@@ -30,9 +30,9 @@ local toggle_l2 = {
   Identifier = "os.missions.jwst.togglel2",
   Name = "Toggle L2 line and small L2 label",
   Command = [[
-    local list = openspace.getProperty('{lagrange_points_earth_l2_small}.*.Enabled'); 
-    for _,v in pairs(list) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) 
+    local list = openspace.getProperty('{lagrange_points_earth_l2_small}.*.Enabled');
+    for _,v in pairs(list) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
     end
   ]],
   Documentation = "Toggle L2 label, point and line",
@@ -44,9 +44,9 @@ local toggle_fov = {
   Identifier = "os.missions.jwst.togglefov",
   Name = "Toggle JWST field of view and view band",
   Command = [[
-    local list = openspace.getProperty('{mission_jwst_fov}.*.Enabled'); 
-    for _,v in pairs(list) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) 
+    local list = openspace.getProperty('{mission_jwst_fov}.*.Enabled');
+    for _,v in pairs(list) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
     end
   ]],
   Documentation = "Toggle James Webb Space Telecope field of view and view band",
@@ -58,7 +58,7 @@ local setup_launch = {
   Identifier = "os.missoins.jwst.setup.launch",
   Name = "Set to JWST launch time",
   Command = [[
-    openspace.time.setDeltaTime(1); 
+    openspace.time.setDeltaTime(1);
     openspace.time.setTime('2021-12-25T12:20:01');
   ]],
   Documentation = "Set the time to the launch time of JWST",
@@ -70,7 +70,7 @@ local setup_detach = {
   Identifier = "os.missions.jwst.setup.detach",
   Name = "Set to JWST detach time",
   Command = [[
-    openspace.time.setDeltaTime(1); 
+    openspace.time.setDeltaTime(1);
     openspace.time.setTime('2021-12-25T12:50:00');
   ]],
   Documentation = "Set the time to the detach time of JWST",
@@ -82,7 +82,7 @@ local toggle_sun_trail = {
   Identifier = "os.missions.jwst.togglesuntrail",
   Name = "Toggle JWST Sun trail",
   Command = [[
-    local value = openspace.getPropertyValue('Scene.JWSTSunTrail.Renderable.Enabled'); 
+    local value = openspace.getPropertyValue('Scene.JWSTSunTrail.Renderable.Enabled');
     openspace.setPropertyValueSingle('Scene.JWSTSunTrail.Renderable.Enabled', not value);
   ]],
   Documentation = "Toggle JWST trail relative to the Sun",
@@ -94,14 +94,14 @@ local toggle_trails_except_moon = {
   Identifier = "os.missions.jwst.toggletrialsexceptmoon",
   Name = "Toggle trails (except Moon)",
   Command = [[
-    local list = openspace.getProperty('{planetTrail_solarSystem}.Renderable.Enabled'); 
-    for _,v in pairs(list) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) 
-    end 
-    local moonlist = openspace.getProperty('{moonTrail_solarSystem}.Renderable.Enabled') 
-    for _,v in pairs(moonlist) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) 
-    end 
+    local list = openspace.getProperty('{planetTrail_solarSystem}.Renderable.Enabled');
+    for _,v in pairs(list) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+    end
+    local moonlist = openspace.getProperty('{moonTrail_solarSystem}.Renderable.Enabled')
+    for _,v in pairs(moonlist) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
+    end
     openspace.setPropertyValueSingle('Scene.MoonTrail.Renderable.Enabled', true)
   ]],
   Documentation = "Toggle all planet and moon trails, except the Moon",
@@ -113,9 +113,9 @@ local toggle_jwst_trail = {
   Identifier = "os.missions.jwst.togglejwsttrails",
   Name = "Toggle JWST trail",
   Command = [[
-    local list = {'Scene.JWSTTrailLaunch.Renderable.Enabled', 'Scene.JWSTTrailCruise.Renderable.Enabled', 'Scene.JWSTTrailCoRevOrbit.Renderable.Enabled'}; 
-    for _,v in pairs(list) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)); 
+    local list = {'Scene.JWSTTrailLaunch.Renderable.Enabled', 'Scene.JWSTTrailCruise.Renderable.Enabled', 'Scene.JWSTTrailCoRevOrbit.Renderable.Enabled'};
+    for _,v in pairs(list) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v));
     end
   ]],
   Documentation = "Toggle JWST launch, cruise and L2 co-revolving orbit trails, not the Sun trail",
diff --git a/data/assets/scene/solarsystem/missions/jwst/jwst.asset b/data/assets/scene/solarsystem/missions/jwst/jwst.asset
index 2df50e614b..821929ee73 100644
--- a/data/assets/scene/solarsystem/missions/jwst/jwst.asset
+++ b/data/assets/scene/solarsystem/missions/jwst/jwst.asset
@@ -48,8 +48,7 @@ local JWSTBand = {
     Segments = 50,
     DisableFadeInOut = true,
     Orientation = "Inside",
-    Opacity = 0.05,
-    RenderBinMode = "PreDeferredTransparent",
+    Opacity = 0.05
   },
   Tag = { "mission_jwst_fov" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/missions/jwst/toggle_trail.asset b/data/assets/scene/solarsystem/missions/jwst/toggle_trail.asset
index 37c8900d1c..0dd57b1d1e 100644
--- a/data/assets/scene/solarsystem/missions/jwst/toggle_trail.asset
+++ b/data/assets/scene/solarsystem/missions/jwst/toggle_trail.asset
@@ -1,6 +1,6 @@
 local toggle_trail = {
   Identifier = "event.jwst.toggle_trail",
-  Name = "Toggle JWST Trail (Auto)",
+  Name = "Toggle JWST trail (auto)",
   Command = [[
     local node
     if is_declared("args") then
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/actions.asset b/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
index b93946cd0d..5445b9fda0 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/actions.asset
@@ -13,7 +13,7 @@ local focus_newhorizons = {
 
 local anchor_nh_aim_pluto = {
   Identifier = "os.missions.newhorizons.aimpluto",
-  Name = "Anchor NH, Aim  Pluto",
+  Name = "Anchor NH, Aim Pluto",
   Command = [[
     openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'NewHorizons');
     openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', 'Pluto');
@@ -29,7 +29,7 @@ local focus_pluto = {
   Name = "Focus on Pluto",
   Command = [[
     openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'PlutoProjection');
-    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', ''); 
+    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
     openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
   ]],
   Documentation = "Sets the focus of the camera on 'Pluto'",
@@ -52,7 +52,7 @@ local focus_charon = {
 
 local toggle_nh_imageprojection = {
   Identifier = "os.missions.newhorizons.toggleimageprojection",
-  Name = "Toggle NH Image Projection",
+  Name = "Toggle NH image projection",
   Command = [[
     local enabled = openspace.getPropertyValue('Scene.PlutoProjection.Renderable.ProjectionComponent.PerformProjection');
     openspace.setPropertyValue('Scene.PlutoProjection.Renderable.ProjectionComponent.PerformProjection', not enabled);
@@ -90,7 +90,7 @@ local approach_time_and_projections = {
 
 local increase_hightmap_pluto = {
   Identifier = "os.missions.newhorizons.pluto.increasehightmap",
-  Name = "Pluto HeightExaggeration +",
+  Name = "Pluto height exaggeration +",
   Command = [[
     openspace.setPropertyValueSingle("Scene.PlutoProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.PlutoProjection.Renderable.HeightExaggeration") + 5000);
   ]],
@@ -101,7 +101,7 @@ local increase_hightmap_pluto = {
 
 local decrease_hightmap_pluto = {
   Identifier = "os.missions.newhorizons.pluto.decreasehightmap",
-  Name = "Pluto HeightExaggeration -",
+  Name = "Pluto height exaggeration -",
   Command = [[
     openspace.setPropertyValueSingle("Scene.PlutoProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.PlutoProjection.Renderable.HeightExaggeration") - 5000);
   ]],
@@ -112,7 +112,7 @@ local decrease_hightmap_pluto = {
 
 local increase_hightmap_charon = {
   Identifier = "os.missions.newhorizons.charon.increasehightmap",
-  Name = "Charon HeightExaggeration +",
+  Name = "Charon height exaggeration +",
   Command = [[
     openspace.setPropertyValueSingle("Scene.CharonProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.CharonProjection.Renderable.HeightExaggeration") + 5000);
   ]],
@@ -123,7 +123,7 @@ local increase_hightmap_charon = {
 
 local decrease_hightmap_charon = {
   Identifier = "os.missions.newhorizons.charon.decreasehightmap",
-  Name = "Charon HeightExaggeration -",
+  Name = "Charon height exaggeration -",
   Command = [[
     openspace.setPropertyValueSingle("Scene.CharonProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.CharonProjection.Renderable.HeightExaggeration") - 5000);
   ]],
@@ -134,7 +134,7 @@ local decrease_hightmap_charon = {
 
 local toggle_pluto_trail = {
   Identifier = "os.missions.newhorizons.pluto.toggletrail",
-  Name = "Toggle Pluto Trail",
+  Name = "Toggle Pluto trail",
   Command = [[
     openspace.setPropertyValueSingle('Scene.PlutoBarycentricTrail.Renderable.Enabled', not openspace.getPropertyValue('Scene.PlutoBarycentricTrail.Renderable.Enabled'));
   ]],
@@ -145,11 +145,11 @@ local toggle_pluto_trail = {
 
 local toggle_pluto_labels = {
   Identifier = "os.missions.newhorizons.pluto.togglelabels",
-  Name = "Toggle Pluto Labels",
+  Name = "Toggle Pluto labels",
   Command = [[
-    local list = {"Scene.PlutoText.Renderable.Enabled", "Scene.CharonText.Renderable.Enabled", "Scene.HydraText.Renderable.Enabled", "Scene.NixText.Renderable.Enabled", "Scene.KerberosText.Renderable.Enabled", "Scene.StyxText.Renderable.Enabled"}; 
-    for _,v in pairs(list) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) 
+    local list = {"Scene.PlutoText.Renderable.Enabled", "Scene.CharonText.Renderable.Enabled", "Scene.HydraText.Renderable.Enabled", "Scene.NixText.Renderable.Enabled", "Scene.KerberosText.Renderable.Enabled", "Scene.StyxText.Renderable.Enabled"};
+    for _,v in pairs(list) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
     end
   ]],
   Documentation = "Toggles the visibility of the text labels of Pluto, Charon, Hydra, Nix, Kerberos, and Styx",
@@ -159,13 +159,13 @@ local toggle_pluto_labels = {
 
 local toggle_nh_labels = {
   Identifier = "os.missions.newhorizons.togglelabels",
-  Name = "Toggle New Horizons Labels",
+  Name = "Toggle New Horizons labels",
   Command = [[
-    local v = openspace.getPropertyValue("Scene.Labels.Renderable.Opacity"); 
-    if v <= 0.5 then 
-      openspace.setPropertyValueSingle("Scene.Labels.Renderable.Opacity",1.0,2.0) 
-    else 
-      openspace.setPropertyValueSingle("Scene.Labels.Renderable.Opacity",0.0,2.0) 
+    local v = openspace.getPropertyValue("Scene.Labels.Renderable.Opacity");
+    if v <= 0.5 then
+      openspace.setPropertyValueSingle("Scene.Labels.Renderable.Opacity",1.0,2.0)
+    else
+      openspace.setPropertyValueSingle("Scene.Labels.Renderable.Opacity",0.0,2.0)
     end
   ]],
   Documentation = "Toggles the visibility of the labels for the New Horizons instruments",
@@ -175,7 +175,7 @@ local toggle_nh_labels = {
 
 local toggle_shadows = {
   Identifier = "os.missions.newhorizons.toggleshadows",
-  Name = "Toggle Shadows",
+  Name = "Toggle shadows",
   Command = [[
     openspace.setPropertyValueSingle('Scene.PlutoShadow.Renderable.Enabled', not openspace.getPropertyValue('Scene.PlutoShadow.Renderable.Enabled'));
     openspace.setPropertyValueSingle('Scene.CharonShadow.Renderable.Enabled', not openspace.getPropertyValue('Scene.CharonShadow.Renderable.Enabled'));
@@ -187,7 +187,7 @@ local toggle_shadows = {
 
 local toggle_nh_trail = {
   Identifier = "os.missions.newhorizons.toggletrail",
-  Name = "Toggle NH Trail",
+  Name = "Toggle New Horizons trail",
   Command = [[
     openspace.setPropertyValueSingle('Scene.NewHorizonsTrailPluto.Renderable.Enabled', not openspace.getPropertyValue('Scene.NewHorizonsTrailPluto.Renderable.Enabled'));
   ]],
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
index dfa48eed7d..838adfc573 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/actions.asset
@@ -1,9 +1,9 @@
 local focus_osirisrex = {
   Identifier = "os.missions.osirisrex.focus",
-  Name = "Focus on OsirisRex",
+  Name = "Focus on OsirisREx",
   Command = [[
-    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'OsirisRex'); 
-    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', ''); 
+    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'OsirisRex');
+    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
     openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
   ]],
   Documentation = "Sets the focus of the camera on 'OsirisRex'",
@@ -15,8 +15,8 @@ local focus_bennu = {
   Identifier = "os.missions.osirisrex.bennu.focus",
   Name = "Focus on Bennu",
   Command = [[
-    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'BennuBarycenter'); 
-    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', ''); 
+    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'BennuBarycenter');
+    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
     openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
   ]],
   Documentation = "Sets the focus of the camera on 'Bennu'",
@@ -40,7 +40,7 @@ local bennu_survey_time = {
   Identifier = "os.missions.osirisrex.setup.bennusurvey",
   Name = "Set Bennu survey time",
   Command = [[
-    openspace.printInfo('Set time: Preliminary Survey'); 
+    openspace.printInfo('Set time: Preliminary Survey');
     openspace.time.setTime('2018-NOV-20 01:13:12.183');
   ]],
   Documentation = "Sets the time to the preliminary survey of Bennu",
@@ -52,7 +52,7 @@ local bennu_event_b = {
   Identifier = "os.missions.osirisrex.setup.bennueventb",
   Name = "Set orbital B event time",
   Command = [[
-    openspace.printInfo('Set time: Orbital B'); 
+    openspace.printInfo('Set time: Orbital B');
     openspace.time.setTime('2019-APR-08 10:35:27.186');
   ]],
   Documentation = "Sets the time to the orbital B event",
@@ -64,7 +64,7 @@ local bennu_recon_event = {
   Identifier = "os.missions.osirisrex.setup.bennureconevent",
   Name = "Set recon event time",
   Command = [[
-    openspace.printInfo('Set time: Recon'); 
+    openspace.printInfo('Set time: Recon');
     openspace.time.setTime('2019-MAY-25 03:50:31.195');
   ]],
   Documentation = "Sets the time to the recon event",
diff --git a/data/assets/scene/solarsystem/missions/perseverance/actions.asset b/data/assets/scene/solarsystem/missions/perseverance/actions.asset
index 534f8d8dfd..aa8a769fa5 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/actions.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/actions.asset
@@ -1,6 +1,6 @@
 local setup_perseverance = {
   Identifier = "os.missions.perseverance.setup",
-  Name = "Setup and Goto Perseverance",
+  Name = "Setup and go to Perseverance",
   Command = [[
     openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1685.5);
     openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', -1686.0);
@@ -21,7 +21,7 @@ asset.onInitialize(function()
 end)
 
 asset.onDeinitialize(function()
-  openspace.action.removeAction(setup_perseverance)   
+  openspace.action.removeAction(setup_perseverance)
 end)
 
 asset.meta = {
@@ -31,4 +31,4 @@ asset.meta = {
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
-}
\ No newline at end of file
+}
diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
index 2c694b7059..93e86cae24 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
@@ -21,10 +21,11 @@ local images = asset.syncedResource({
   Type = "HttpSynchronization",
   Identifier = "rosettaimages",
   Version = 2,
-  UnzipFiles = true
+  UnzipFiles = true,
+  UnzipFilesDestination = "images"
 })
 
-local imagesDestination = images .. "images_v1_v2"
+local imagesDestination = images .. "images"
 
 local Barycenter = {
   Identifier = "67PBarycenter",
@@ -136,8 +137,8 @@ local focus_67p = {
   Identifier = "os.missions.rosetta.67p.focus",
   Name = "Focus on 67P",
   Command = [[
-    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', '67P'); 
-    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', ''); 
+    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', '67P');
+    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
     openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
   ]],
   Documentation = "Sets the focus of the camera on 67P",
diff --git a/data/assets/scene/solarsystem/missions/rosetta/actions.asset b/data/assets/scene/solarsystem/missions/rosetta/actions.asset
index f8fda4a8f2..39b8d0f0e2 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/actions.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/actions.asset
@@ -2,9 +2,9 @@ local toggle_outer_planetary_trails = {
   Identifier = "os.missions.rosetta.toggleouterplanetarytrails",
   Name = "Toggle outer planetary trails",
   Command = [[
-    local list = openspace.getProperty('{planetTrail_giants}.Renderable.Enabled'); 
-    for _,v in pairs(list) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) 
+    local list = openspace.getProperty('{planetTrail_giants}.Renderable.Enabled')
+    for _,v in pairs(list) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(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 e0fa4248cf..69c258e62b 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
@@ -560,8 +560,8 @@ local focus_rosetta = {
   Identifier = "os.missions.rosetta.focus",
   Name = "Focus on Rosetta",
   Command = [[
-    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Rosetta'); 
-    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', ''); 
+    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Rosetta');
+    openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
     openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
   ]],
   Documentation = "Sets the focus of the camera on Rosetta",
diff --git a/data/assets/scene/solarsystem/missions/voyager/actions.asset b/data/assets/scene/solarsystem/missions/voyager/actions.asset
index 2a061362b7..750aa75786 100644
--- a/data/assets/scene/solarsystem/missions/voyager/actions.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/actions.asset
@@ -1,6 +1,6 @@
 local jupiter_approach = {
   Identifier = "os.missions.voyager.setup.jupiterapproach",
-  Name = "Set Jupiter Approach",
+  Name = "Set Jupiter approach",
   Command = [[
     openspace.time.setTime('1979-01-20T01:32:07.914')
   ]],
@@ -11,7 +11,7 @@ local jupiter_approach = {
 
 local saturn_approach = {
   Identifier = "os.missions.voyager.setup.saturnapproach",
-  Name = "Set Saturn Approach",
+  Name = "Set Saturn approach",
   Command = [[
     openspace.time.setTime('1980-10-20T07:43:42.645');
   ]],
@@ -50,9 +50,9 @@ local toggle_minormoon_trails = {
   Identifier = "os.missions.voyager.toggleminormoontrails",
   Name = "Toggle minor trails",
   Command = [[
-    local list = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled'); 
-    for _,v in pairs(list) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) 
+    local list = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled')
+    for _,v in pairs(list) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
     end
   ]],
   Documentation = "Toggles the trails of the minor moons",
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 ee21045e91..a474b485c4 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,7 @@ 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 
+    Horizons data for better performance then spice but lower resolution. Data is from
     shortly after mission launches until January 1st, 2030]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset
index 70cf21bfd3..47711364c7 100644
--- a/data/assets/scene/solarsystem/planets/earth/earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/earth.asset
@@ -77,8 +77,8 @@ local focus_earth = {
   Identifier = "os.solarsystem.earth.focus",
   Name = "Focus on Earth",
   Command = [[
-    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', ''); 
-    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth'); 
+    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');
+    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth');
     openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
   ]],
   Documentation = "Set camera focus on the Earth",
@@ -90,9 +90,9 @@ local toggle_earth_satellitetrails = {
   Identifier = "os.solarsystem.earth.togglesatellitetrails",
   Name = "Toggle satellite trails",
   Command = [[
-    local list = openspace.getProperty('{earth_satellites}.Renderable.Enabled'); 
-    for _,v in pairs(list) do 
-      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) 
+    local list = openspace.getProperty('{earth_satellites}.Renderable.Enabled');
+    for _,v in pairs(list) do
+      openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
     end
   ]],
   Documentation = "Toggle trails on or off for satellites around Earth",
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 82a0506fe3..bf774d859f 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset
@@ -39,7 +39,6 @@ local L1 = {
   Parent = L1Position.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
-    RenderBinMode = "Opaque",
     Billboard = true,
     Size = 700E5,
     Texture = circle .. "circle.png",
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 bae8099049..5dfbe59979 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset
@@ -64,7 +64,6 @@ local L2Small = {
   Parent = L2Position.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
-    RenderBinMode = "Opaque",
     Billboard = true,
     Size = 400E4,
     Texture = circle .. "circle.png",
@@ -82,7 +81,6 @@ local L2 = {
   Parent = L2Position.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
-    RenderBinMode = "Opaque",
     Billboard = true,
     Size = 700E5,
     Texture = circle .. "circle.png",
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 4acaf26ebf..4118b9e731 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset
@@ -39,7 +39,6 @@ local L4 = {
   Parent = L4Position.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
-    RenderBinMode = "Opaque",
     Billboard = true,
     Size = 800E6,
     Texture = circle .. "circle.png",
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 cd66f1bc15..fcb3c0a195 100644
--- a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset
@@ -39,7 +39,6 @@ local L5 = {
   Parent = L5Position.Identifier,
   Renderable = {
     Type = "RenderablePlaneImageLocal",
-    RenderBinMode = "Opaque",
     Billboard = true,
     Size = 800E6,
     Texture = circle .. "circle.png",
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 a5236a497e..7a0e42cac4 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
@@ -5,7 +5,7 @@ local layer = {
   Name = "Terrain tileset",
   Enabled = asset.enabled,
   FilePath = asset.localResource("terrain_tileset.wms"),
-  TilePixelSize = 64,
+  TilePixelSize = 512,
   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/earth/layers/heightlayers/terrain_tileset.wms b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.wms
index 5de12576ea..4c910a7cbd 100644
--- a/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.wms
+++ b/data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.wms
@@ -3,14 +3,20 @@
     <ServerUrl>http://earthlive.maptiles.arcgis.com/arcgis/rest/services/GCS_Elevation3D/ImageServer/tile/${z}/${y}/${x}</ServerUrl>
   </Service>
   <DataWindow>
-    <UpperLeftX>-180</UpperLeftX> <UpperLeftY>90</UpperLeftY>
-    <LowerRightX>180</LowerRightX> <LowerRightY>-90</LowerRightY>
-    <SizeX>16777216</SizeX> <SizeY>8388608</SizeY>
-    <TileLevel>14</TileLevel> <YOrigin>top</YOrigin>
+    <UpperLeftX>-180</UpperLeftX>
+    <UpperLeftY>90</UpperLeftY>
+    <LowerRightX>180</LowerRightX>
+    <LowerRightY>-90</LowerRightY>
+    <SizeX>16777216</SizeX>
+    <SizeY>8388608</SizeY>
+    <TileLevel>14</TileLevel>
+    <YOrigin>top</YOrigin>
   </DataWindow>
   <Projection>EPSG:4326</Projection>
-  <BlockSizeX>512</BlockSizeX> <BlockSizeY>512</BlockSizeY>
-  <BandsCount>1</BandsCount> <DataType>Float32</DataType>
+  <BlockSizeX>512</BlockSizeX>
+  <BlockSizeY>512</BlockSizeY>
+  <BandsCount>1</BandsCount>
+  <DataType>Float32</DataType>
   <DataValues NoData="0" Min="-11000" Max="8500"/>
   <MaxConnections>5</MaxConnections>
   <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
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 3821b0d9cf..b50ce2d086 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
@@ -31,7 +31,7 @@ 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 
+  Description = [[Moon Clementine UVVIS Global Mosaic 118m v2 map of the Moon. This map
     is hosted on the OpenSpace server in Utah]],
   Author = "USGS",
   URL = "https://astrogeology.usgs.gov/search/map/Moon/Clementine/UVVIS/Lunar_Clementine_UVVIS_750nm_Global_Mosaic_118m_v2",
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 0c6c6281eb..9a003caeac 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
@@ -30,7 +30,7 @@ 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 
+  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",
   URL = "https://astrogeology.usgs.gov/search/map/Moon/LMMP/LOLA-derived/Lunar_LRO_LOLA_ClrShade_Global_128ppd_v04",
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 64821b6005..c2f88054f2 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
@@ -5,7 +5,7 @@ local layer = {
   Name = "Lola DEM [Sweden]",
   Enabled = asset.enabled,
   FilePath = asset.localResource("loladem_sweden.wms"),
-  TilePixelSize = 64,
+  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 116e382fa5..3d6c9268ad 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
@@ -5,7 +5,7 @@ local layer = {
   Name = "Lola DEM [Utah]",
   Enabled = asset.enabled,
   FilePath = asset.localResource("loladem_utah.wms"),
-  TilePixelSize = 64,
+  TilePixelSize = 360,
   Settings = { Multiplier = 0.5 },
   Description = [[This digital elevation model (DEM) is based on data from the Lunar
     Orbiter Laser Altimeter (LOLA; Smith et al., 2010), an instrument on the National
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
index 3a6c45e3c6..a5c7a7ca36 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
@@ -85,8 +85,8 @@ local focus_moon = {
   Identifier = "os.solarsystem.earth.moon.focus",
   Name = "Focus on Moon",
   Command = [[
-    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', ''); 
-    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Moon'); 
+    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');
+    openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Moon');
     openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
   ]],
   Documentation = "Set camera focus on the Moon",
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/ColorHillshade.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/ColorHillshade.wms
index 8a3d650cec..4cc2dcff22 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/ColorHillshade.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/ColorHillshade.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Colorized_Confidence.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Colorized_Confidence.wms
index 7140cdc16f..6ffd8591c4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Colorized_Confidence.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Colorized_Confidence.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Grayscale.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Grayscale.wms
index b4c3f51024..73b7018321 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Grayscale.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Grayscale.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Hillshade.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Hillshade.wms
index 528693c7fd..b9ade746bc 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Hillshade.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Metric_Cam_DEM/Hillshade.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_1.wms
index 48bc9ffc12..8171540bf0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_2.wms
index ffa7e96b9e..225256e788 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Aristarchus_Plateau_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Tsiolkovskiy_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Tsiolkovskiy_Crater.wms
index b486f683ab..a9d92ebc6f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Tsiolkovskiy_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_DEM/Tsiolkovskiy_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_1.wms
index 633607e1e4..01708fe109 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_2.wms
index fe1b2bb55e..6ed96e23b6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Aristarchus_Plateau_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Tsiolkovskiy_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Tsiolkovskiy_Crater.wms
index 010370d670..fdaf69e3d9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Tsiolkovskiy_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_15_Pan_Cam_Image_Mosaic/Tsiolkovskiy_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Colorized_Confidence.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Colorized_Confidence.wms
index 969cfd53c0..6d1b223116 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Colorized_Confidence.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Colorized_Confidence.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Grayscale.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Grayscale.wms
index 6324a309b4..8884fa823e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Grayscale.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Grayscale.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Hillshade.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Hillshade.wms
index 2e5b009a48..0b6929ea0b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Hillshade.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_16_Metric_Cam_DEM/Hillshade.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM/ColorHillshade.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM/ColorHillshade.wms
index 4346d468e8..f7ce2eb666 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM/ColorHillshade.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM/ColorHillshade.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM/Grayscale.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM/Grayscale.wms
index fe50009c25..e9af95c4bd 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM/Grayscale.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_17_Metric_Cam_DEM/Grayscale.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam/Hillshade.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam/Hillshade.wms
index 9e31144ec6..0758ec558f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam/Hillshade.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam/Hillshade.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM/ColorHillshade.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM/ColorHillshade.wms
index 526ffb4b30..a8a2b640ca 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM/ColorHillshade.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Apollo_Zone_Metric_Cam_DEM/ColorHillshade.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_15_Metric_Cam_Image_Mosaic.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_15_Metric_Cam_Image_Mosaic.wms
index 3e0115d47f..a7504abb13 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_15_Metric_Cam_Image_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_15_Metric_Cam_Image_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_17_Metric_Cam_Image_Mosaic.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_17_Metric_Cam_Image_Mosaic.wms
index 92d333cd7c..1f062adde4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_17_Metric_Cam_Image_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_17_Metric_Cam_Image_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_Zone_Metric_Cam_Image_Mosaic.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_Zone_Metric_Cam_Image_Mosaic.wms
index 3aa5790f40..522901fb1c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_Zone_Metric_Cam_Image_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Apollo_Zone_Metric_Cam_Image_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_FeO_Weight_Percent.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_FeO_Weight_Percent.wms
index a7ab0ec427..2de80748eb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_FeO_Weight_Percent.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_FeO_Weight_Percent.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_Optical_Maturity.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_Optical_Maturity.wms
index 6eda6e34e8..e2f6d9a6d2 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_Optical_Maturity.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_Optical_Maturity.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_TiO2_Weight_Percent.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_TiO2_Weight_Percent.wms
index fcd533e447..ece18b5cbe 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_TiO2_Weight_Percent.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_TiO2_Weight_Percent.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_Warped_Color_Ratio.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_Warped_Color_Ratio.wms
index 244cb46b5c..778d107bad 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_Warped_Color_Ratio.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Clementine_UVVIS_Warped_Color_Ratio.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Kaguya_TC_Ortho_Mosaic.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Kaguya_TC_Ortho_Mosaic.wms
index 299bbe254c..e6883ec699 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Kaguya_TC_Ortho_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/Kaguya_TC_Ortho_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LOLA_Permanently_Shadowed_Regions_Northpole_240m.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LOLA_Permanently_Shadowed_Regions_Northpole_240m.wms
index 2676c75e8b..98968afce7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LOLA_Permanently_Shadowed_Regions_Northpole_240m.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LOLA_Permanently_Shadowed_Regions_Northpole_240m.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LOLA_Permanently_Shadowed_Regions_Southpole_240m.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LOLA_Permanently_Shadowed_Regions_Southpole_240m.wms
index 934d17540b..e61a3681ef 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LOLA_Permanently_Shadowed_Regions_Southpole_240m.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LOLA_Permanently_Shadowed_Regions_Southpole_240m.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LP_NS_H_Abundance.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LP_NS_H_Abundance.wms
index 007f37915f..471b67a916 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LP_NS_H_Abundance.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LP_NS_H_Abundance.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LROC_NAC_Uncontrolled_Mosaic_of_Mare_Unit_in_Schrodinger_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LROC_NAC_Uncontrolled_Mosaic_of_Mare_Unit_in_Schrodinger_Crater.wms
index 6966c9744f..e40f86da44 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LROC_NAC_Uncontrolled_Mosaic_of_Mare_Unit_in_Schrodinger_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LROC_NAC_Uncontrolled_Mosaic_of_Mare_Unit_in_Schrodinger_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LROC_NAC_Uncontrolled_Mosaic_of_Massif_in_Schrodinger_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LROC_NAC_Uncontrolled_Mosaic_of_Massif_in_Schrodinger_Crater.wms
index 70176373e6..1a44645e6c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LROC_NAC_Uncontrolled_Mosaic_of_Massif_in_Schrodinger_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LROC_NAC_Uncontrolled_Mosaic_of_Massif_in_Schrodinger_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_Diviner_CF_Mosaic.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_Diviner_CF_Mosaic.wms
index 2bf8a980b4..97e714c005 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_Diviner_CF_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_Diviner_CF_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LOLA_and_Kaguya_TC_Color_Hillshade_512ppd.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LOLA_and_Kaguya_TC_Color_Hillshade_512ppd.wms
index cbcdf83801..069a49453a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LOLA_and_Kaguya_TC_Color_Hillshade_512ppd.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LOLA_and_Kaguya_TC_Color_Hillshade_512ppd.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LOLA_and_Kaguya_TC_Hillshade_512ppd.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LOLA_and_Kaguya_TC_Hillshade_512ppd.wms
index 413a4ab1e3..7995783565 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LOLA_and_Kaguya_TC_Hillshade_512ppd.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LOLA_and_Kaguya_TC_Hillshade_512ppd.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LROC_WAC_Image_Mosaic.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LROC_WAC_Image_Mosaic.wms
index 10119ac39f..202e2ecfb7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LROC_WAC_Image_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_LROC_WAC_Image_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_Mini-RF_First_Stokes_Parameter.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_Mini-RF_First_Stokes_Parameter.wms
index bc639337d6..b76f3e39d1 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_Mini-RF_First_Stokes_Parameter.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_Mini-RF_First_Stokes_Parameter.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_WAC_Mosaic_v2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_WAC_Mosaic_v2.wms
index aa91c98790..10b6c5cc6b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_WAC_Mosaic_v2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Global/LRO_WAC_Mosaic_v2.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity/Colorized.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity/Colorized.wms
index 3048a2ea20..0e14aaca18 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity/Colorized.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity/Colorized.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity/Greyscale.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity/Greyscale.wms
index af70205ac2..0ee50bc201 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity/Greyscale.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Freeair_Gravity/Greyscale.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity/Colorized.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity/Colorized.wms
index ad4bc35e02..c911fbd6df 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity/Colorized.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity/Colorized.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity/Greyscale.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity/Greyscale.wms
index 2d129665fe..c44f38e8af 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity/Greyscale.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/Kaguya_LGM2011_Surface_Gravity/Greyscale.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd/Colorized.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd/Colorized.wms
index 3694d730f4..2afd8554ed 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd/Colorized.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Roughness_16ppd/Colorized.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd/Colorized.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd/Colorized.wms
index 93ae2003f9..15e58561d0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd/Colorized.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_16ppd/Colorized.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m/Colorized.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m/Colorized.wms
index 1979921452..7357f0c848 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m/Colorized.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Northpole_120m/Colorized.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m/Colorized.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m/Colorized.wms
index 088aed1767..1d51f6710c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m/Colorized.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_Slope_Southpole_120m/Colorized.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd/Shade.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd/Shade.wms
index 53757508ec..20d35b2a2b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd/Shade.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LOLA_and_TC_Stereo_DEM_Merge_512ppd/Shade.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater/50cmpx.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater/50cmpx.wms
index 73c0e80f82..5ded080023 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater/50cmpx.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Region_Inside_Schrodinger_Crater/50cmpx.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater/10mpx.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater/10mpx.wms
index 4e56b81768..7cab4383f7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater/10mpx.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LROC_NAC_Uncontrolled_Mosaic_of_Schrodinger_Crater/10mpx.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic/Filled.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic/Filled.wms
index 2660d258e5..9be506ba21 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic/Filled.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic/Filled.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd/Colorized.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd/Colorized.wms
index 6b81390923..5c2494a544 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd/Colorized.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_CF_Mosaic_128ppd/Colorized.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg/Color.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg/Color.wms
index c26bde256a..cc9a943c50 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg/Color.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Avg/Color.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg/Color.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg/Color.wms
index 3ead585c4e..3cbd3df4cf 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg/Color.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temp_Normal_Avg/Color.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd/Colorized.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd/Colorized.wms
index 05d4fc8b87..00f9e4b95b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd/Colorized.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Diviner_Surface_Temperature_Mosaic_128ppd/Colorized.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/ColorHillshade.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/ColorHillshade.wms
index 5126740a5e..738e988a99 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/ColorHillshade.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/ColorHillshade.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/ColorHillshade_v6.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/ColorHillshade_v6.wms
index 7688230505..493e33d491 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/ColorHillshade_v6.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/ColorHillshade_v6.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/Coverage.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/Coverage.wms
index 29b9ecaf88..466628b5f4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/Coverage.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/Coverage.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/Hillshade.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/Hillshade.wms
index 64418c18e4..65e740e2ab 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/Hillshade.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/Hillshade.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/N_Pole.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/N_Pole.wms
index af86bc744b..916654ebb0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/N_Pole.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/N_Pole.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/No_Data_Mask.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/No_Data_Mask.wms
index f15a0c429d..d42e2b41ac 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/No_Data_Mask.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/No_Data_Mask.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/S_Pole.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/S_Pole.wms
index 288074d3d6..79b845ddd3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/S_Pole.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LOLA_DEM/S_Pole.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aitken_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aitken_Crater.wms
index 085220ce2a..26ac1889da 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aitken_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aitken_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Alphonsus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Alphonsus_Crater.wms
index 05453af3a3..b115eeed8c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Alphonsus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Alphonsus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Anaxagoras_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Anaxagoras_Crater.wms
index 77cef2ec17..d619be4f19 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Anaxagoras_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Anaxagoras_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_15.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_15.wms
index 7e04a636ae..768884e46d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_15.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_15.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_16.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_16.wms
index 7995e784a6..fced56d911 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_16.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_16.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_Basin.wms
index 9995edd792..f88a4e5726 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Apollo_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aristarchus_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aristarchus_1.wms
index e3253f3b57..90dea302c6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aristarchus_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aristarchus_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aristarchus_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aristarchus_2.wms
index c848984a04..bea781d6c0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aristarchus_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Aristarchus_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Balmer_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Balmer_Basin.wms
index 83b0925059..c549043482 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Balmer_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Balmer_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Bullialdus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Bullialdus_Crater.wms
index 94f9d1712a..137503d54d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Bullialdus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Bullialdus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Gruithuisen_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Gruithuisen_Domes.wms
index 9e4674604e..b13981486b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Gruithuisen_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Gruithuisen_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Hertzsprung.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Hertzsprung.wms
index 1096292bfb..7984e9a8d6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Hertzsprung.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Hertzsprung.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Hortensius_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Hortensius_Domes.wms
index 2def787865..2e582a7206 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Hortensius_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Hortensius_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/King_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/King_Crater.wms
index ccb651939b..c97aaf0308 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/King_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/King_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Lichtenberg_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Lichtenberg_Crater.wms
index 67bd9f84de..aaeee23a5d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Lichtenberg_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Lichtenberg_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Mare_Crisium.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Mare_Crisium.wms
index 73738f3847..5f13af5801 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Mare_Crisium.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Mare_Crisium.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Montes_Pyrenaeus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Montes_Pyrenaeus.wms
index 61524c29b5..4d3b75ed23 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Montes_Pyrenaeus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Montes_Pyrenaeus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Orientale_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Orientale_1.wms
index a907893d03..4d152de9ce 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Orientale_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Orientale_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Plato_Ejecta.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Plato_Ejecta.wms
index d800ddea65..fe6e8a0061 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Plato_Ejecta.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Plato_Ejecta.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/South_Pole-Aitken_Basin_Interior.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/South_Pole-Aitken_Basin_Interior.wms
index 48e4047da3..6238fca4cf 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/South_Pole-Aitken_Basin_Interior.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/South_Pole-Aitken_Basin_Interior.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Stratton_Dewar_High_Fe_Anomaly.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Stratton_Dewar_High_Fe_Anomaly.wms
index dcd8c1a71b..abf9b74af9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Stratton_Dewar_High_Fe_Anomaly.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Stratton_Dewar_High_Fe_Anomaly.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Sulpicius_Gallus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Sulpicius_Gallus.wms
index 1dc11eac81..1215b2587e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Sulpicius_Gallus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Sulpicius_Gallus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Tycho_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Tycho_Crater.wms
index 8e30cddbd8..971eb84d9e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Tycho_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance/Tycho_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aitken_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aitken_Crater.wms
index 0a507b29bf..e5715fcb95 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aitken_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aitken_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Alphonsus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Alphonsus_Crater.wms
index ce136392e3..c0bb8eec2e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Alphonsus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Alphonsus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Anaxagoras_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Anaxagoras_Crater.wms
index c60a3810d1..5acd2fbe09 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Anaxagoras_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Anaxagoras_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_15.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_15.wms
index 8eacc3b897..1f1b386d10 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_15.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_15.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_16.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_16.wms
index e3858be89b..0fa3d86506 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_16.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_16.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_Basin.wms
index 945a6d4d74..bf2378b3fa 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Apollo_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aristarchus_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aristarchus_1.wms
index e72c54a53c..da8f30f09d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aristarchus_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aristarchus_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aristarchus_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aristarchus_2.wms
index dd8b8de60e..4d2bc5d479 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aristarchus_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Aristarchus_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Balmer_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Balmer_Basin.wms
index 62b56de18a..e67565c7db 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Balmer_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Balmer_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Bullialdus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Bullialdus_Crater.wms
index 9fc6982056..ce55609f8a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Bullialdus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Bullialdus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Gruithuisen_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Gruithuisen_Domes.wms
index 288254c917..a95bd18501 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Gruithuisen_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Gruithuisen_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Hertzsprung.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Hertzsprung.wms
index 1762b2c210..726013f61a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Hertzsprung.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Hertzsprung.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Hortensius_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Hortensius_Domes.wms
index ee1f640b12..b2754d37ac 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Hortensius_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Hortensius_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/King_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/King_Crater.wms
index 8693df93ec..5fa9ef7495 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/King_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/King_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Lichtenberg_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Lichtenberg_Crater.wms
index dbcf300b8c..c55bbe878e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Lichtenberg_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Lichtenberg_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Mare_Crisium.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Mare_Crisium.wms
index f752a06757..1ec7904487 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Mare_Crisium.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Mare_Crisium.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Montes_Pyrenaeus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Montes_Pyrenaeus.wms
index 337707db59..46fa3c3f9d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Montes_Pyrenaeus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Montes_Pyrenaeus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Orientale_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Orientale_1.wms
index 65976eea00..8283cd54ec 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Orientale_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Orientale_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Plato_Ejecta.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Plato_Ejecta.wms
index ba3edecbb2..ccdeb35a49 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Plato_Ejecta.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Plato_Ejecta.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.wms
index cfdeb0eef7..5a4632fdff 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
index 4ae99a0270..515693e4c5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Sulpicius_Gallus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Sulpicius_Gallus.wms
index 8fd96c3755..57e4d6adb7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Sulpicius_Gallus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Sulpicius_Gallus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Tycho_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Tycho_Crater.wms
index 43c88a176f..9113c7abf4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Tycho_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Abundance_Hazard/Tycho_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aitken_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aitken_Crater.wms
index 08a638db59..c97deb97b9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aitken_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aitken_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Alphonsus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Alphonsus_Crater.wms
index 9baec57c04..e51690d3f4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Alphonsus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Alphonsus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Anaxagoras_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Anaxagoras_Crater.wms
index a6f69afb68..b17c95e2f3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Anaxagoras_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Anaxagoras_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_15.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_15.wms
index 2ecc73ec7c..fe7d8da33e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_15.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_15.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_16.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_16.wms
index 4a438278ce..8c4c9d17e9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_16.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_16.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_Basin.wms
index 726f629c16..958a4b37d2 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Apollo_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aristarchus_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aristarchus_1.wms
index db392d5410..b736cde6d1 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aristarchus_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aristarchus_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aristarchus_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aristarchus_2.wms
index c8cef6a2ac..e4adf0e4de 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aristarchus_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Aristarchus_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Balmer_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Balmer_Basin.wms
index facc879b7c..274f43be34 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Balmer_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Balmer_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Bullialdus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Bullialdus_Crater.wms
index 74325aeaf6..8c92b0fc5c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Bullialdus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Bullialdus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Gruithuisen_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Gruithuisen_Domes.wms
index 0d1270e9e7..61e6dcaaa3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Gruithuisen_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Gruithuisen_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Hertzsprung.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Hertzsprung.wms
index 2c82fd83fa..75ee143fc7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Hertzsprung.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Hertzsprung.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Hortensius_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Hortensius_Domes.wms
index e6b3caa9d2..f89ed7ce4c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Hortensius_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Hortensius_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/King_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/King_Crater.wms
index 04edf3014f..a518a8d5f6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/King_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/King_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Lichtenberg_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Lichtenberg_Crater.wms
index 3fad207909..052908916a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Lichtenberg_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Lichtenberg_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Mare_Crisium.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Mare_Crisium.wms
index 8dabc72a51..52f9f71b3c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Mare_Crisium.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Mare_Crisium.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Montes_Pyrenaeus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Montes_Pyrenaeus.wms
index a51cb3373f..bd7ca53acc 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Montes_Pyrenaeus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Montes_Pyrenaeus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Orientale_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Orientale_1.wms
index 7ae74d8a94..3ef55c0caf 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Orientale_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Orientale_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Plato_Ejecta.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Plato_Ejecta.wms
index d176ddb789..5b6f9198b7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Plato_Ejecta.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Plato_Ejecta.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/South_Pole-Aitken_Basin_Interior.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/South_Pole-Aitken_Basin_Interior.wms
index 1209b3f91d..c8ded83d04 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/South_Pole-Aitken_Basin_Interior.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/South_Pole-Aitken_Basin_Interior.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Stratton_Dewar_High_Fe_Anomaly.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Stratton_Dewar_High_Fe_Anomaly.wms
index a364a61a4b..dfe125dcf6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Stratton_Dewar_High_Fe_Anomaly.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Stratton_Dewar_High_Fe_Anomaly.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Sulpicius_Gallus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Sulpicius_Gallus.wms
index 8d9c85a482..e153a379bc 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Sulpicius_Gallus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Sulpicius_Gallus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Tycho_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Tycho_Crater.wms
index 75876e5695..81f61d9bf8 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Tycho_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density/Tycho_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aitken_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aitken_Crater.wms
index dc443c3f81..d0f0545315 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aitken_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aitken_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Alphonsus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Alphonsus_Crater.wms
index 198dd55a8a..bb750768b6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Alphonsus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Alphonsus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Anaxagoras_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Anaxagoras_Crater.wms
index ba62161ca4..0aebae190a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Anaxagoras_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Anaxagoras_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_15.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_15.wms
index b6574337ff..536a1e9d14 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_15.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_15.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_16.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_16.wms
index fddb1436fb..242dfef60a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_16.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_16.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_Basin.wms
index f9229c11cb..8079bcab2d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Apollo_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aristarchus_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aristarchus_1.wms
index a07060caf1..d4c510ab56 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aristarchus_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aristarchus_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aristarchus_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aristarchus_2.wms
index 3806c2fb46..2a2754bb77 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aristarchus_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Aristarchus_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Balmer_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Balmer_Basin.wms
index 4b986365a5..693fa53ec1 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Balmer_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Balmer_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Bullialdus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Bullialdus_Crater.wms
index 0c67fe8810..b4a91324f5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Bullialdus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Bullialdus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Gruithuisen_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Gruithuisen_Domes.wms
index 129f0da091..7f68e46eb7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Gruithuisen_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Gruithuisen_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Hertzsprung.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Hertzsprung.wms
index 0a8906dadf..af2ed9fb36 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Hertzsprung.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Hertzsprung.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Hortensius_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Hortensius_Domes.wms
index 0fa7c2878a..d37fc2db30 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Hortensius_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Hortensius_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/King_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/King_Crater.wms
index bb921b435d..886a9bdb9e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/King_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/King_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Lichtenberg_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Lichtenberg_Crater.wms
index 5a97d0b2fc..b2d1bee826 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Lichtenberg_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Lichtenberg_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Mare_Crisium.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Mare_Crisium.wms
index 6f362c8a24..91c35ca275 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Mare_Crisium.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Mare_Crisium.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Montes_Pyrenaeus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Montes_Pyrenaeus.wms
index f6dc08dfc9..faed92e00b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Montes_Pyrenaeus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Montes_Pyrenaeus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Orientale_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Orientale_1.wms
index 06f7d69a0d..5fea4ffa1f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Orientale_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Orientale_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Plato_Ejecta.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Plato_Ejecta.wms
index f4873a982e..e2ce9a15fd 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Plato_Ejecta.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Plato_Ejecta.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/South_Pole-Aitken_Basin_Interior.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/South_Pole-Aitken_Basin_Interior.wms
index d873486cc1..0b9e1e8cb3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/South_Pole-Aitken_Basin_Interior.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/South_Pole-Aitken_Basin_Interior.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
index 771af89c84..33bd686344 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Sulpicius_Gallus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Sulpicius_Gallus.wms
index 66db241841..da8fb8c75f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Sulpicius_Gallus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Sulpicius_Gallus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Tycho_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Tycho_Crater.wms
index 6df134a9ad..5421053b3a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Tycho_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Crater_Density_Hazard/Tycho_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aitken_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aitken_Crater.wms
index 04f3cca2df..aca7f03ab0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aitken_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aitken_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Alphonsus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Alphonsus.wms
index 3d00fdd5f8..ab0a2279c8 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Alphonsus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Alphonsus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Alphonsus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Alphonsus_Crater.wms
index 8dc1ebf2ea..d2600e1124 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Alphonsus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Alphonsus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Anaxagoras_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Anaxagoras_Crater.wms
index 68e6379d52..7e280abfd0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Anaxagoras_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Anaxagoras_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_15.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_15.wms
index 0ef2b5b06a..c0307d6f43 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_15.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_15.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_16.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_16.wms
index 33dcacc18b..9a8cdef8a4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_16.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_16.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_Basin.wms
index c1e590bdac..e3b7266216 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Apollo_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aristarchus_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aristarchus_1.wms
index dccc56dfb8..94f56f30de 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aristarchus_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aristarchus_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aristarchus_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aristarchus_2.wms
index 3d035f72b8..171c8d4439 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aristarchus_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Aristarchus_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Balmer_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Balmer_Basin.wms
index 7e5798c850..e591b89ea6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Balmer_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Balmer_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Bullialdus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Bullialdus_Crater.wms
index b185bd7bdb..e93a58bb57 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Bullialdus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Bullialdus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Compton_Belkovich_Th_Anomaly.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Compton_Belkovich_Th_Anomaly.wms
index 02d5e07c4a..daccd7fb09 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Compton_Belkovich_Th_Anomaly.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Compton_Belkovich_Th_Anomaly.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Dante_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Dante_Crater.wms
index 24901e5bab..387379394b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Dante_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Dante_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Flamsteed_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Flamsteed_Crater.wms
index c259fb86d6..b6c8f53935 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Flamsteed_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Flamsteed_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Fresh_Crater_East_of_Lents.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Fresh_Crater_East_of_Lents.wms
index d9e4d1aece..1c3385363c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Fresh_Crater_East_of_Lents.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Fresh_Crater_East_of_Lents.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Gruithuisen_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Gruithuisen_Domes.wms
index 781cd16f6e..4ee3583077 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Gruithuisen_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Gruithuisen_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Hertzsprung.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Hertzsprung.wms
index 19f69f0c4f..c1ff1fafdd 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Hertzsprung.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Hertzsprung.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Hortensius_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Hortensius_Domes.wms
index 8aae4a35ce..ac16c45de1 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Hortensius_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Hortensius_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Humboldtianum_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Humboldtianum_Basin.wms
index f34e17280d..589dd0da0d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Humboldtianum_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Humboldtianum_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Ina_D-Caldera.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Ina_D-Caldera.wms
index c478495c2a..0a459cb978 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Ina_D-Caldera.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Ina_D-Caldera.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/King_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/King_Crater.wms
index e2feffcc7b..02fd3d31a0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/King_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/King_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Lichtenberg_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Lichtenberg_Crater.wms
index b0dcb70681..4ccd08b349 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Lichtenberg_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Lichtenberg_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Crisium.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Crisium.wms
index d52230d726..48f0356a75 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Crisium.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Crisium.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Ingenii.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Ingenii.wms
index df5f83be55..86e0c23c82 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Ingenii.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Ingenii.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Moscoviense.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Moscoviense.wms
index c0f94951bc..37b38ae4bf 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Moscoviense.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Moscoviense.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Smythii.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Smythii.wms
index 736310bd5e..7d187a3ad4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Smythii.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Smythii.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Tranquillitatis.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Tranquillitatis.wms
index 2764dcea78..2d08dddb1d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Tranquillitatis.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Mare_Tranquillitatis.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Marius_Hills.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Marius_Hills.wms
index 1bb7b46b3d..f29114b5da 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Marius_Hills.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Marius_Hills.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Montes_Pyrenaeus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Montes_Pyrenaeus.wms
index e6bdecdb49..73b064154b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Montes_Pyrenaeus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Montes_Pyrenaeus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Murchison_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Murchison_Crater.wms
index dd3daed8c2..af9b25d02c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Murchison_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Murchison_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Orientale_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Orientale_1.wms
index ea70b465fb..a2fda9dc79 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Orientale_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Orientale_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Plato_Ejecta.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Plato_Ejecta.wms
index 39f252014f..dc28989354 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Plato_Ejecta.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Plato_Ejecta.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Reiner_Gamma.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Reiner_Gamma.wms
index f01f73c91a..36373d4d84 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Reiner_Gamma.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Reiner_Gamma.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Riccioli_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Riccioli_Crater.wms
index a9f9f1d890..bf0617e86e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Riccioli_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Riccioli_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Rima_Bode.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Rima_Bode.wms
index ef3d53c2f3..77af458332 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Rima_Bode.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Rima_Bode.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Rimae_Prinz.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Rimae_Prinz.wms
index 2550fee475..a88992ea94 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Rimae_Prinz.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Rimae_Prinz.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/South_Pole-Aitken_Basin_Interior.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/South_Pole-Aitken_Basin_Interior.wms
index 122e7da236..7cab8a4e15 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/South_Pole-Aitken_Basin_Interior.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/South_Pole-Aitken_Basin_Interior.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/South_Pole-Aitken_Rim.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/South_Pole-Aitken_Rim.wms
index 5b7e91202d..62fa7eec46 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/South_Pole-Aitken_Rim.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/South_Pole-Aitken_Rim.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Stratton_Dewar.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Stratton_Dewar.wms
index 6f262ddc7b..25fd1a5cdb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Stratton_Dewar.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Stratton_Dewar.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Stratton_Dewar_High_Fe_Anomaly.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Stratton_Dewar_High_Fe_Anomaly.wms
index afea4cb7ac..5cddc06246 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Stratton_Dewar_High_Fe_Anomaly.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Stratton_Dewar_High_Fe_Anomaly.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Sulpicius_Gallus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Sulpicius_Gallus.wms
index b44c08fe82..08e5ee8223 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Sulpicius_Gallus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Sulpicius_Gallus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Tsiolkovskiy_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Tsiolkovskiy_Crater.wms
index c0d083664b..34edf9552e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Tsiolkovskiy_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Tsiolkovskiy_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Tycho_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Tycho_Crater.wms
index 2ff1fe2b73..9405976ab7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Tycho_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_DEM/Tycho_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aitken_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aitken_Crater.wms
index 7ef9c136ce..ac2013f577 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aitken_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aitken_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Alphonsus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Alphonsus.wms
index 933648935e..ed580a2568 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Alphonsus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Alphonsus.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Apollo_15.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Apollo_15.wms
index 5281ae0071..56233be4cb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Apollo_15.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Apollo_15.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Apollo_16.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Apollo_16.wms
index 94b6624e18..8f99b800f3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Apollo_16.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Apollo_16.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aristarchus_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aristarchus_1.wms
index a8fd4c387d..3389d8e530 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aristarchus_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aristarchus_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aristarchus_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aristarchus_2.wms
index 64e03e4777..410be02f9c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aristarchus_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Aristarchus_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Balmer_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Balmer_Basin.wms
index 4820cf827d..b0bca01131 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Balmer_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Balmer_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Compton_Belkovich_Th_Anomaly.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Compton_Belkovich_Th_Anomaly.wms
index f731f0cc6e..84e71f1f0e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Compton_Belkovich_Th_Anomaly.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Compton_Belkovich_Th_Anomaly.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Flamsteed_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Flamsteed_Crater.wms
index 78f433d25f..cad3e78ae3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Flamsteed_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Flamsteed_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Gruithuisen_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Gruithuisen_Domes.wms
index 5f771b564e..98b90f3166 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Gruithuisen_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Gruithuisen_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Hertzsprung.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Hertzsprung.wms
index 1a646b71e6..4f6cab74a4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Hertzsprung.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Hertzsprung.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Hortensius_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Hortensius_Domes.wms
index 3ca85c164f..02a0edbeef 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Hortensius_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Hortensius_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Humboldtianum_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Humboldtianum_Basin.wms
index f2469ff4dc..0be9a295d0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Humboldtianum_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Humboldtianum_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Ina_D-Caldera.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Ina_D-Caldera.wms
index 260d041b8d..3775d84d58 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Ina_D-Caldera.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Ina_D-Caldera.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/King_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/King_Crater.wms
index 2e692c927c..7782a3e014 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/King_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/King_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Lichtenberg_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Lichtenberg_Crater.wms
index b65ad57875..dea3d73604 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Lichtenberg_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Lichtenberg_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Ingenii.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Ingenii.wms
index 7a991bc708..334362793f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Ingenii.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Ingenii.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Moscoviense.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Moscoviense.wms
index 102d73fc3f..a38009ebdf 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Moscoviense.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Moscoviense.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Smythii.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Smythii.wms
index 9079578bdf..56b9310509 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Smythii.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Smythii.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Tranquillitatis.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Tranquillitatis.wms
index 65cd2d9a2f..cb60e32414 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Tranquillitatis.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Mare_Tranquillitatis.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Marius_Hills.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Marius_Hills.wms
index d8e7897c88..e8d6cb4772 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Marius_Hills.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Marius_Hills.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Montes_Pyrenaeus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Montes_Pyrenaeus.wms
index 66967e42f9..72e5866554 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Montes_Pyrenaeus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Montes_Pyrenaeus.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Murchison_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Murchison_Crater.wms
index 9a488a5d3a..e5a2b79281 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Murchison_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Murchison_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Orientale_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Orientale_1.wms
index cb1dbc15de..2f32c000c9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Orientale_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Orientale_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Reiner_Gamma.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Reiner_Gamma.wms
index 06e95ff07d..17e8ddfb37 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Reiner_Gamma.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Reiner_Gamma.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Riccioli_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Riccioli_Crater.wms
index 937434458d..a4bb5796ce 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Riccioli_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Riccioli_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Rima_Bode.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Rima_Bode.wms
index ca4b70c74c..477cc2c42f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Rima_Bode.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Rima_Bode.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Rimae_Prinz.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Rimae_Prinz.wms
index dc312869fe..4caca65240 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Rimae_Prinz.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Rimae_Prinz.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/South_Pole-Aitken_Basin_Interior.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/South_Pole-Aitken_Basin_Interior.wms
index 7771026811..751ffe7f44 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/South_Pole-Aitken_Basin_Interior.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/South_Pole-Aitken_Basin_Interior.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/South_Pole-Aitken_Rim.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/South_Pole-Aitken_Rim.wms
index dd69661346..e0f4c5ddb7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/South_Pole-Aitken_Rim.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/South_Pole-Aitken_Rim.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Stratton_Dewar.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Stratton_Dewar.wms
index 239dbfc69b..516bf11698 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Stratton_Dewar.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Stratton_Dewar.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Sulpicius_Gallus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Sulpicius_Gallus.wms
index 4b2fccac70..efec2eeca5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Sulpicius_Gallus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Sulpicius_Gallus.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Tsiolkovskiy_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Tsiolkovskiy_Crater.wms
index e73e528d6d..38783de118 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Tsiolkovskiy_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Tsiolkovskiy_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Tycho_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Tycho_Crater.wms
index 6c93162104..bbdab23c01 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Tycho_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic/Tycho_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm/Apollo_11.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm/Apollo_11.wms
index d2adeec182..08312c8b37 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm/Apollo_11.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_26cm/Apollo_11.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm/Apollo_14.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm/Apollo_14.wms
index a976ea983f..d072b05b10 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm/Apollo_14.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Image_Mosaic_28cm/Apollo_14.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic/Fresh_Crater_East_of_Lents.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic/Fresh_Crater_East_of_Lents.wms
index af0c218dec..b3651b8e25 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic/Fresh_Crater_East_of_Lents.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Mosaic/Fresh_Crater_East_of_Lents.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic/N_Pole.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic/N_Pole.wms
index 21344fcf95..caf54ed327 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic/N_Pole.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic/N_Pole.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic/S_Pole.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic/S_Pole.wms
index 6d564a1554..1f77713c6d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic/S_Pole.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_NAC_Image_Mosaic/S_Pole.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aitken_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aitken_Crater.wms
index 918a77486e..4b8ec390b7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aitken_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aitken_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Alphonsus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Alphonsus_Crater.wms
index b9566e71f8..7c5024cb8c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Alphonsus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Alphonsus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Anaxagoras_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Anaxagoras_Crater.wms
index 32621aa2aa..020dc11180 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Anaxagoras_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Anaxagoras_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_15.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_15.wms
index 55904b56f1..0eb7b15386 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_15.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_15.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_16.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_16.wms
index 58ff2185ac..fb78d8fde4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_16.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_16.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_Basin.wms
index 0a60aa3cda..97681c7c9e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Apollo_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aristarchus_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aristarchus_1.wms
index c3dc2a04cf..d4a3e5605b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aristarchus_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aristarchus_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aristarchus_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aristarchus_2.wms
index 4872d7b781..730064fb76 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aristarchus_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Aristarchus_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Balmer_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Balmer_Basin.wms
index 72e08e50ca..a72f2323b0 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Balmer_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Balmer_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Bullialdus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Bullialdus_Crater.wms
index 13e2f91ee0..06cbf40ecc 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Bullialdus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Bullialdus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Gruithuisen_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Gruithuisen_Domes.wms
index da4c048108..04b4fa6f20 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Gruithuisen_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Gruithuisen_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Hertzsprung.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Hertzsprung.wms
index 4349a86b26..c15e039b14 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Hertzsprung.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Hertzsprung.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Hortensius_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Hortensius_Domes.wms
index 8dd5fce1bd..46c85c3550 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Hortensius_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Hortensius_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/King_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/King_Crater.wms
index cd4a913b0b..9b4cd14f79 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/King_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/King_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Lichtenberg_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Lichtenberg_Crater.wms
index ef19feba4f..32c729fc40 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Lichtenberg_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Lichtenberg_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Mare_Crisium.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Mare_Crisium.wms
index 4807257b4b..e0c16b4678 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Mare_Crisium.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Mare_Crisium.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Montes_Pyrenaeus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Montes_Pyrenaeus.wms
index 0f59c509ea..4e4ecc3660 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Montes_Pyrenaeus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Montes_Pyrenaeus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Orientale_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Orientale_1.wms
index 41b0245041..375e2a462c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Orientale_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Orientale_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Plato_Ejecta.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Plato_Ejecta.wms
index 8b60333c4c..7dae248709 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Plato_Ejecta.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Plato_Ejecta.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/South_Pole-Aitken_Basin_Interior.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/South_Pole-Aitken_Basin_Interior.wms
index 71d90c3ed5..883ee882a5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/South_Pole-Aitken_Basin_Interior.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/South_Pole-Aitken_Basin_Interior.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Stratton_Dewar_High_Fe_Anomaly.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Stratton_Dewar_High_Fe_Anomaly.wms
index e96083e90a..b18b75770f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Stratton_Dewar_High_Fe_Anomaly.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Stratton_Dewar_High_Fe_Anomaly.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Sulpicius_Gallus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Sulpicius_Gallus.wms
index 4c91ae2e2d..cb7dede11a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Sulpicius_Gallus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Sulpicius_Gallus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Tycho_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Tycho_Crater.wms
index 33603cfd13..dfa89aabac 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Tycho_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance/Tycho_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aitken_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aitken_Crater.wms
index 6d1bcc0d41..e013cbaccb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aitken_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aitken_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Alphonsus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Alphonsus_Crater.wms
index 41f7e07190..f2123fefd9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Alphonsus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Alphonsus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Anaxagoras_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Anaxagoras_Crater.wms
index e7242b48aa..e395ba326e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Anaxagoras_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Anaxagoras_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_15.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_15.wms
index 4a9ba480e8..2e73105cfb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_15.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_15.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_16.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_16.wms
index a849d61b1c..24ca65b1ee 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_16.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_16.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_Basin.wms
index 8b9ce92c08..880588fc63 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Apollo_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aristarchus_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aristarchus_1.wms
index 9e0d97a9f4..48318fe7c5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aristarchus_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aristarchus_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aristarchus_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aristarchus_2.wms
index 5c40ce6257..77d2f8cffb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aristarchus_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Aristarchus_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Balmer_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Balmer_Basin.wms
index ba66691691..0dd3a04cd6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Balmer_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Balmer_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Bullialdus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Bullialdus_Crater.wms
index 25296c77c8..7090b967ea 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Bullialdus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Bullialdus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Gruithuisen_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Gruithuisen_Domes.wms
index 7e912d2527..0fc7f271c6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Gruithuisen_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Gruithuisen_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Hertzsprung.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Hertzsprung.wms
index b2c41fe895..2360031a89 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Hertzsprung.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Hertzsprung.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Hortensius_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Hortensius_Domes.wms
index 6b3b6b0cf0..be1e742b9a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Hortensius_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Hortensius_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/King_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/King_Crater.wms
index c83fb2d9f2..e3b85613d7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/King_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/King_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Lichtenberg_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Lichtenberg_Crater.wms
index 6f7d22d91d..87a3c721e4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Lichtenberg_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Lichtenberg_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Mare_Crisium.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Mare_Crisium.wms
index 26d41e6764..ceb6e3a6ab 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Mare_Crisium.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Mare_Crisium.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Montes_Pyrenaeus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Montes_Pyrenaeus.wms
index 314c5f8edf..e7841a0a3d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Montes_Pyrenaeus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Montes_Pyrenaeus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Orientale_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Orientale_1.wms
index 2f5de17bdf..be2f21db0b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Orientale_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Orientale_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Plato_Ejecta.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Plato_Ejecta.wms
index 3c1525df0b..bef460442b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Plato_Ejecta.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Plato_Ejecta.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.wms
index 720bd3bea1..407babefcf 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/South_Pole-Aitken_Basin_Interior.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
index 3f775efda0..67f31a12ab 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Sulpicius_Gallus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Sulpicius_Gallus.wms
index 605031e319..74c6cbef61 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Sulpicius_Gallus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Sulpicius_Gallus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Tycho_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Tycho_Crater.wms
index 8faee58692..0d3cb4e0d3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Tycho_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Abundance_Hazard/Tycho_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aitken_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aitken_Crater.wms
index c0e01953eb..3900a95f8e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aitken_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aitken_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Alphonsus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Alphonsus_Crater.wms
index 7f0ea0a4d7..fa628b4456 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Alphonsus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Alphonsus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Anaxagoras_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Anaxagoras_Crater.wms
index 581118452d..df4f23ee20 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Anaxagoras_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Anaxagoras_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_15.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_15.wms
index b26454a642..ccdd201095 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_15.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_15.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_16.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_16.wms
index d6dcd172a7..603a20c470 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_16.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_16.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_Basin.wms
index d2b8ba9d47..a7bc56854f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Apollo_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aristarchus_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aristarchus_1.wms
index 70961a1989..0dfdd60e9a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aristarchus_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aristarchus_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aristarchus_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aristarchus_2.wms
index 7aafb91823..cb153dde86 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aristarchus_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Aristarchus_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Balmer_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Balmer_Basin.wms
index f98c5993ad..dbb6c3fb1a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Balmer_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Balmer_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Bullialdus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Bullialdus_Crater.wms
index 6d2bd2a09f..35d101053c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Bullialdus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Bullialdus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Gruithuisen_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Gruithuisen_Domes.wms
index c38f389fea..cb19dd4c8b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Gruithuisen_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Gruithuisen_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hazard_Aitken_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hazard_Aitken_Crater.wms
index 09b76b6e1d..df70a396db 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hazard_Aitken_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hazard_Aitken_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hertzsprung.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hertzsprung.wms
index 10a4400c14..1f3e0fe1e6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hertzsprung.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hertzsprung.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hortensius_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hortensius_Domes.wms
index 907706a4d4..e5d8378df3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hortensius_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Hortensius_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/King_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/King_Crater.wms
index 252d19dd49..d96c98ef0a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/King_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/King_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Lichtenberg_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Lichtenberg_Crater.wms
index d8e3be0f08..83fa4d7464 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Lichtenberg_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Lichtenberg_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Mare_Crisium.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Mare_Crisium.wms
index 379253c7b7..6635f02a34 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Mare_Crisium.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Mare_Crisium.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Montes_Pyrenaeus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Montes_Pyrenaeus.wms
index f1dbdcf948..8b36cd4518 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Montes_Pyrenaeus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Montes_Pyrenaeus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Orientale_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Orientale_1.wms
index ff1866da95..8186fff880 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Orientale_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Orientale_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Plato_Ejecta.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Plato_Ejecta.wms
index 76836059c1..b6d1fd49e7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Plato_Ejecta.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Plato_Ejecta.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/South_Pole-Aitken_Basin_Interior.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/South_Pole-Aitken_Basin_Interior.wms
index bdc2f18087..67b2b9c812 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/South_Pole-Aitken_Basin_Interior.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/South_Pole-Aitken_Basin_Interior.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Stratton_Dewar_High_Fe_Anomaly.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Stratton_Dewar_High_Fe_Anomaly.wms
index 8fa2605104..45d1d2fa1d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Stratton_Dewar_High_Fe_Anomaly.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Stratton_Dewar_High_Fe_Anomaly.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Sulpicius_Gallus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Sulpicius_Gallus.wms
index e11b71e0c2..b13cf5c141 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Sulpicius_Gallus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Sulpicius_Gallus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Tycho_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Tycho_Crater.wms
index 2567df6b0a..6a9f270ceb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Tycho_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density/Tycho_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Alphonsus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Alphonsus_Crater.wms
index c7a3f6688b..9d44c762ca 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Alphonsus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Alphonsus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Anaxagoras_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Anaxagoras_Crater.wms
index a0e507a2d2..1d186da20d 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Anaxagoras_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Anaxagoras_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_15.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_15.wms
index 1a6fee66f0..84293c004e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_15.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_15.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_16.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_16.wms
index 5a979b4754..cc3423871e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_16.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_16.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_Basin.wms
index 92b58d0814..8eebabcc72 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Apollo_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Aristarchus_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Aristarchus_1.wms
index 88fce9c4b2..c84e0289a5 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Aristarchus_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Aristarchus_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Aristarchus_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Aristarchus_2.wms
index 8d8e3adaec..a10374ffbc 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Aristarchus_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Aristarchus_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Balmer_Basin.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Balmer_Basin.wms
index 516f769b69..b342f09292 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Balmer_Basin.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Balmer_Basin.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Bullialdus_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Bullialdus_Crater.wms
index 31d1e27f92..aeb6ba1ee9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Bullialdus_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Bullialdus_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Gruithuisen_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Gruithuisen_Domes.wms
index cba09a0f03..cdee459e0a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Gruithuisen_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Gruithuisen_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Hertzsprung.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Hertzsprung.wms
index a477946b9c..38ac793091 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Hertzsprung.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Hertzsprung.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Hortensius_Domes.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Hortensius_Domes.wms
index 21f6a298a7..c0c8bf66e1 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Hortensius_Domes.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Hortensius_Domes.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/King_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/King_Crater.wms
index 246167ab39..7278d51fb8 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/King_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/King_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Lichtenberg_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Lichtenberg_Crater.wms
index 716d86c90a..b91fdc80e4 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Lichtenberg_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Lichtenberg_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Mare_Crisium.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Mare_Crisium.wms
index e067624235..540eff6f52 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Mare_Crisium.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Mare_Crisium.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Montes_Pyrenaeus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Montes_Pyrenaeus.wms
index 99ede46b0c..cd178e6fdb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Montes_Pyrenaeus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Montes_Pyrenaeus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Orientale_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Orientale_1.wms
index ae96822335..1f4737fb3e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Orientale_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Orientale_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Plato_Ejecta.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Plato_Ejecta.wms
index 2e64e98d46..da44665696 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Plato_Ejecta.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Plato_Ejecta.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/South_Pole-Aitken_Basin_Interior.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/South_Pole-Aitken_Basin_Interior.wms
index a01e7b488c..ea762a0ac9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/South_Pole-Aitken_Basin_Interior.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/South_Pole-Aitken_Basin_Interior.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
index 5edef14caa..fefcad102b 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Stratton_Dewar_High_Fe_Anomaly.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Sulpicius_Gallus.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Sulpicius_Gallus.wms
index 908a0060a1..db46fdcaf6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Sulpicius_Gallus.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Sulpicius_Gallus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Tycho_Crater.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Tycho_Crater.wms
index 6577a62408..4c81b99c1a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Tycho_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_LROC_Rock_Density_Hazard/Tycho_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter/Albedo_Global.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter/Albedo_Global.wms
index 40e2f8dcf6..57a1c0fc20 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter/Albedo_Global.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Laser_Altimeter/Albedo_Global.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio/Grayscale.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio/Grayscale.wms
index e856a90d3c..641f0ffb60 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio/Grayscale.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Mini-RF_Circular_Polarization_Ratio/Grayscale.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade/Lacus_Mortis.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade/Lacus_Mortis.wms
index 353709ee78..c9d3401ec9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade/Lacus_Mortis.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_ColorHillshade/Lacus_Mortis.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic/Lacus_Mortis.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic/Lacus_Mortis.wms
index 96aaaa5bcd..aa588f38df 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic/Lacus_Mortis.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic/Lacus_Mortis.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
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 e23be56778..a60559a59f 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
@@ -10,7 +10,7 @@ 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"),
-  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.]]
+  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()
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp/Von_Karman.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp/Von_Karman.wms
index c026405a86..829029064e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp/Von_Karman.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_0.5mpp/Von_Karman.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp/Von_Karman.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp/Von_Karman.wms
index 105340c856..b4ae1f79e3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp/Von_Karman.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_Mosaic_1mpp/Von_Karman.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp/N_Pole.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp/N_Pole.wms
index a2945c11cb..e25c293008 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp/N_Pole.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp/N_Pole.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp/S_Pole.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp/S_Pole.wms
index 3a92ee6faa..c4ee4fa4ba 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp/S_Pole.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_PSR_Mosaic_20mpp/S_Pole.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp/Von_Karman.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp/Von_Karman.wms
index 8641fa7703..4bb346978c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp/Von_Karman.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_NAC_and_CE-2_CCD_Mosaic_1mpp/Von_Karman.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
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 3bff1d29b1..6cce87ea53 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
@@ -11,9 +11,9 @@ local treks_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"),
   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.
- 
+
+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.
+
 The landing site, located at 0.67416 N, 23.47314 E, is in the southwest part of Mare Tranquilitatis, an area characterized by extensive deposits of mare basalt.
 ]]
 }
@@ -23,9 +23,9 @@ local treks_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"),
   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.
- 
+
+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.
+
 The landing site, located at 3.0138 S N, 23.4219 W, is in the southern part of Oceanus Procellarum, an area characterized by extensive deposits of basalt significantly younger than that at the Apollo 11 site. The site also provided the first samples of KREEP, material rich in potassium, phosphorus, and rare earth elements. The potential for sampling ejecta from one of the rays extending from the crater Copernicus added to the attractiveness of the site.
 ]]
 }
@@ -35,9 +35,9 @@ local treks_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"),
   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.
- 
+
+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.
+
 The landing site, located at 3.64589 S, 17.47194 W, was selected largely with the goal of sampling material from the Imbrium Basin impact, whose ejecta covers much of this area, known as the Fra Mauro formation.]]
 }
 
@@ -46,9 +46,9 @@ local treks_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"),
   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. 
- 
+
+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.
+
 The landing site, located at 26.13239 N, 3.63330 E, was selected to provide access to the basalt of Mare Imbrium, the stratigraphy revealed in the deep channel of Hadley Rille carved by flowing lava, and mountain material from the front of the Apennine Range.
 ]]
 }
@@ -58,9 +58,9 @@ local treks_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"),
   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. 
- 
+
+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.
+
 With the previous Apollo landings having focused on the low, flat, basaltic terrain of the lunar maria or seas, Apollo 16 was the first crewed mission to visit the lunar highlands. The landing site, located at 8.9734 S, 15.5011 E, was located on the boundary of two highland geologic units, the Descartes Formation and the Cayley Formation. Both units were thought to be volcanic in nature, but composed of lavas with higher silica content than the basaltic rocks of the maria; the Descartes Formation was widely thought to be rhyolite. However, the astronauts quickly discovered on their traverses that the rocks around them were overwhelmingly breccias. The great surprise of Apollo 16 was the discovery that the highland terrain was not silicic lava, but fluidized ejecta from a great basin-forming impact, an that the rocks were crustal material, largely anorthosite and gabbro.
 ]]
 }
@@ -125,11 +125,11 @@ 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"),
-  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 “orange soil”, 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.  
+  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.
+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.
 
-The landing site, located at 20.1911 N, 30.7723 E, is in a narrow valley in the Taurus Mountains near the crater Littrow. The Taurus Mountains form part of the Serenitatis impact basin, and sampling some of the ancient highland terrain into which the basin was excavated could help determine the date of the basin’s formation. Mare basalt subsequently flooded the floor of the valley, and after that parts of the area were blanketed by pyroclastic ash deposits erupting from dark-haloed volcanic craters. The site could therefore provide access to a diverse range of sample material.]]
+The landing site, located at 20.1911 N, 30.7723 E, is in a narrow valley in the Taurus Mountains near the crater Littrow. The Taurus Mountains form part of the Serenitatis impact basin, and sampling some of the ancient highland terrain into which the basin was excavated could help determine the date of the basin's formation. Mare basalt subsequently flooded the floor of the valley, and after that parts of the area were blanketed by pyroclastic ash deposits erupting from dark-haloed volcanic craters. The site could therefore provide access to a diverse range of sample material.]]
 }
 
 local treks_ingenii_skylight = {
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_11_Landing_Site.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_11_Landing_Site.wms
index 58be1ebbd7..ad66cda11c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_11_Landing_Site.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_11_Landing_Site.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_12_Landing_Site.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_12_Landing_Site.wms
index 81e7b55915..f37c3d39af 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_12_Landing_Site.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_12_Landing_Site.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_14_Landing_Site.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_14_Landing_Site.wms
index ca514dcf1b..d892cf7dd9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_14_Landing_Site.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_14_Landing_Site.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_15_Landing_Site.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_15_Landing_Site.wms
index b5a9e504ff..4a5f5f0a5a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_15_Landing_Site.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_15_Landing_Site.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_16_Landing_Site.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_16_Landing_Site.wms
index faf05d84f2..1a1266f88c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_16_Landing_Site.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Apollo_16_Landing_Site.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/ColorHillShade_Apollo_17.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/ColorHillShade_Apollo_17.wms
index 79433bfff7..4b9a2fa4bf 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/ColorHillShade_Apollo_17.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/ColorHillShade_Apollo_17.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/HillShade_Apollo_17.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/HillShade_Apollo_17.wms
index 29c65d0643..c170acecac 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/HillShade_Apollo_17.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/HillShade_Apollo_17.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_11.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_11.wms
index bd02a91d0a..9c21e95e36 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_11.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_11.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_12.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_12.wms
index 103e9070e9..ba09ed46f9 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_12.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_12.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_14.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_14.wms
index 272fc7ad5b..72b941a211 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_14.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_14.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_15.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_15.wms
index a35afc11c5..9615b1b547 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_15.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_15.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_16.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_16.wms
index ee93ef1e20..5f699c56a1 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_16.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_16.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_17.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_17.wms
index 5c28de00cf..21aabb02dc 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_17.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_17.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_17_Landing_Site.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_17_Landing_Site.wms
index 04553831b1..2e261caebb 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_17_Landing_Site.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Apollo_17_Landing_Site.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Ingenii.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Ingenii.wms
index cf0c00e1ad..b7cea9b823 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Ingenii.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Ingenii.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Marius.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Marius.wms
index c970d381a1..89ec954ad7 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Marius.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Marius.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger.wms
index d46667c0bb..ed94914c35 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Extra.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Extra.wms
index 131b6991f7..a417f9ac0c 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Extra.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Extra.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Landing_Site.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Landing_Site.wms
index 1ba88b6e41..c111c9edd6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Landing_Site.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_Landing_Site.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_NorthEast.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_NorthEast.wms
index e7a0138ad2..60ca0c7eb6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_NorthEast.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_NorthEast.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthCenter.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthCenter.wms
index 71f9458d49..1ba2071284 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthCenter.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthCenter.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthEast.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthEast.wms
index 95de4b23e3..36eb930205 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthEast.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Schrodinger_SouthEast.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_1.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_1.wms
index 558e197553..63f0894cbd 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_1.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_1.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_2.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_2.wms
index 4b117a763f..20fa566ade 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_2.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Mosaic_Small_Tranquilltatis_2.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Slope_Apollo_17.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Slope_Apollo_17.wms
index 2a09ab1b9c..b56b868be6 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Slope_Apollo_17.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_Narrow_Angle_Camera/Slope_Apollo_17.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM/Grayscale.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM/Grayscale.wms
index 32b7b06e95..723488728e 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM/Grayscale.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC-GLD100_DEM/Grayscale.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM/ColorHillShade.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM/ColorHillShade.wms
index 1304aad8d1..59ee33e51a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM/ColorHillShade.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM/ColorHillShade.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM/Hillshade.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM/Hillshade.wms
index 53b7e880af..dbd44f5de2 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM/Hillshade.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_WAC_GLD100_DEM/Hillshade.wms
@@ -20,5 +20,5 @@
     <BandsCount>1</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Dig_Here.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Dig_Here.wms
index 4d409556f3..7a4f37f94f 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Dig_Here.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Dig_Here.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Likely.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Likely.wms
index 5a9cdcd2bd..9499059622 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Likely.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Likely.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_More_Likely.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_More_Likely.wms
index 7a114f7a5a..aeebf22927 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_More_Likely.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_More_Likely.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Most_Likely.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Most_Likely.wms
index 751fba8a15..bf068eabee 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Most_Likely.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Most_Likely.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Very_Likely.wms b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Very_Likely.wms
index 8aaff45131..a0feead845 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Very_Likely.wms
+++ b/data/assets/scene/solarsystem/planets/earth/moon/nasa-treks/LRO_and_Kaguya_Multi_Instruments_1895.21mpp/3He_Very_Likely.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
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 bb2b4858f3..7ff6894a6d 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
@@ -7,11 +7,11 @@ local Description = [[Carbon monoxide is known as "The Silent Killer" because it
 colorless, odorless, tasteless gas that is poisonous to humans and other oxygen breathing
 organisms. It is also naturally occurring in the atmosphere. Only in high concentrations
 is carbon monoxide deadly. At the Earth's surface the concentration of carbon monoxide is
-100 ppb (parts per billion), however, in urban areas it can get up to 10 ppm (parts per 
+100 ppb (parts per billion), however, in urban areas it can get up to 10 ppm (parts per
 million) or 100 times higher. One of the main anthropogenic sources of carbon monoxide in
-the atmosphere is emissions from automobiles. In areas with heavy traffic the carbon 
-monoxide can be measured at 50 ppm. The natural sources of carbon monoxide include 
-volcanoes and brush burning. Between the anthropogenic and natural sources, scientists 
+the atmosphere is emissions from automobiles. In areas with heavy traffic the carbon
+monoxide can be measured at 50 ppm. The natural sources of carbon monoxide include
+volcanoes and brush burning. Between the anthropogenic and natural sources, scientists
 estimate that the annual production of carbon monoxide is 2-5 gigatons]]
 local URL = "https://sos.noaa.gov/catalog/datasets/carbon-monoxide-2000/"
 
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 51dd695a2c..a8c1f7d703 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
@@ -45,7 +45,7 @@ asset.export(satellites)
 asset.meta = {
   Name = "Satellites Communications - Geostationary",
   Version = "1.0",
-  Description = [[Satellites asset for Communications - Geostationary. Data from 
+  Description = [[Satellites asset for Communications - Geostationary. 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 2b4b2cf976..ad69351616 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
@@ -43,7 +43,7 @@ asset.export(satellites)
 asset.meta = {
   Name = "Satellites Debris - Indian ASAT test Debris",
   Version = "1.0",
-  Description = [[Satellites asset for Debris - Indian ASAT test Debris. Data from 
+  Description = [[Satellites asset for Debris - Indian ASAT test Debris. 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 1d2ab326be..209ca2cd4f 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
@@ -25,7 +25,7 @@ local satellites = {
   GUI = {
     Name = "100 Brightest",
     Path = "/Solar System/Planets/Earth/Satellites",
-    Description = [[The 100 (or so) satellites that will appear brightest when viewed 
+    Description = [[The 100 (or so) satellites that will appear brightest when viewed
       from Earth.]]
   }
 }
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 c4f0081243..5462b52207 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
@@ -59,7 +59,7 @@ local HubbleTrail = {
 
 asset.onInitialize(function ()
   local hubble = openspace.space.readKeplerFile(omm .. "hst.txt", "OMM")
-  HubbleTrail.Renderable.Period = hubble[0].Period / (60 * 60 * 24)
+  HubbleTrail.Renderable.Period = hubble[1].Period / (60 * 60 * 24)
 
   openspace.addSceneGraphNode(HubblePosition)
   openspace.addSceneGraphNode(HubbleTrail)
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 ab30c6340d..144148e880 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
@@ -25,8 +25,8 @@ local satellites = {
   GUI = {
     Name = "SpaceStations",
     Path = "/Solar System/Planets/Earth/Satellites",
-    Description = [[A collection of space stations (including the ISS and China's 
-      Tiangong), along with certain cubesats and satellite constellations from space 
+    Description = [[A collection of space stations (including the ISS and China's
+      Tiangong), along with certain cubesats and satellite constellations from space
       agencies.]]
   }
 }
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 e237bf578a..48d9d6e722 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
@@ -84,7 +84,7 @@ local AquaLabel = {
 
 asset.onInitialize(function ()
   local a = openspace.space.readKeplerFile(omm .. "Aqua.txt", "OMM")
-  AquaTrail.Renderable.Period = a[0].Period / (60 * 60 * 24)
+  AquaTrail.Renderable.Period = a[1].Period / (60 * 60 * 24)
 
   openspace.addSceneGraphNode(Aqua)
   openspace.addSceneGraphNode(AquaTrail)
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 d2ad0e7056..a458127638 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
@@ -43,7 +43,7 @@ asset.export(satellites)
 asset.meta = {
   Name = "Satellites Weather - Search & Rescue (SARSAT)",
   Version = "1.0",
-  Description = [[Satellites asset for Weather - Search & Rescue (SARSAT). Data from 
+  Description = [[Satellites asset for Weather - Search & Rescue (SARSAT). Data from
     Celestrak]],
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
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 a1f28bfd33..4eefd790d6 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
@@ -82,7 +82,7 @@ local SNPPLabel = {
 
 asset.onInitialize(function ()
   local s = openspace.space.readKeplerFile(omm .. "SNPP.txt", "OMM")
-  SNPPTrail.Renderable.Period = s[0].Period / (60 * 60 * 24)
+  SNPPTrail.Renderable.Period = s[1].Period / (60 * 60 * 24)
 
   openspace.addSceneGraphNode(SNPP)
   openspace.addSceneGraphNode(SNPPTrail)
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 d2a89c12d8..caa9076b59 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
@@ -43,7 +43,7 @@ asset.export(satellites)
 asset.meta = {
   Name = "Satellites Weather - Spire",
   Version = "1.0",
-  Description = [[Satellites asset for Weather - Search & Rescue (SARSAT). Data from 
+  Description = [[Satellites asset for Weather - Search & Rescue (SARSAT). 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 cc39b62f47..caa189309e 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
@@ -43,7 +43,7 @@ asset.export(satellites)
 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 
+  Description = [[Satellites asset for Weather - Tracking and Data Relay Satellite
     System (TDRSS). Data from Celestrak]],
   Author = "OpenSpace Team",
   URL = "https://celestrak.com/NORAD/elements/",
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 6e998f1116..5a8451aeb1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
@@ -85,7 +85,7 @@ local TerraLabel = {
 
 asset.onInitialize(function()
   local t = openspace.space.readKeplerFile(omm .. "Terra.txt", "OMM")
-  TerraTrail.Renderable.Period = t[0].Period / (60 * 60 * 24)
+  TerraTrail.Renderable.Period = t[1].Period / (60 * 60 * 24)
 
   openspace.addSceneGraphNode(Terra)
   openspace.addSceneGraphNode(TerraTrail)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
index 6f038f0fa0..f74a81f97c 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 @@
 local transforms = asset.require("../transforms")
 asset.require("spice/base")
 asset.require("./trail")
-local kernel = asset.require("../kernels").jup310
+local kernel = asset.require("../kernels").jup365
 
 local labelsPath = asset.syncedResource({
   Name = "Jupiter Labels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
index 4e278dd93d..0576249c34 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 @@
 local transforms = asset.require("../transforms")
 asset.require("spice/base")
-local kernel = asset.require("../kernels").jup310
+local kernel = asset.require("../kernels").jup365
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
index 002cce3765..b81150b745 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 @@
 local transforms = asset.require("../transforms")
 asset.require("spice/base")
 asset.require("./trail")
-local kernel = asset.require("../kernels").jup310
+local kernel = asset.require("../kernels").jup365
 
 local labelsPath = asset.syncedResource({
   Name = "Jupiter Labels",
@@ -92,7 +92,7 @@ asset.export(Europa)
 
 
 asset.meta = {
-  Name = "Mimas",
+  Name = "Europa",
   Version = "1.1",
   Description = "Europa globe with labels",
   Author = "OpenSpace Team",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
index 5a5e6e7e1b..7854fc5514 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 @@
 local transforms = asset.require("../transforms")
 asset.require("spice/base")
-local kernel = asset.require("../kernels").jup310
+local kernel = asset.require("../kernels").jup365
 
 local EuropaTrail = {
   Identifier = "EuropaTrail",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
index 40fad40f2c..d5aa371cd1 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 @@
 local transforms = asset.require("../transforms")
 asset.require("spice/base")
 asset.require("./trail")
-local kernel = asset.require("../kernels").jup310
+local kernel = asset.require("../kernels").jup365
 
 local labelsPath = asset.syncedResource({
   Name = "Jupiter Labels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
index 974be0f559..48d08b3b2f 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 @@
 local transforms = asset.require("../transforms")
 asset.require("spice/base")
-local kernel = asset.require("../kernels").jup310
+local kernel = asset.require("../kernels").jup365
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
index ff28967ee9..b06f55b355 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 @@
 local transforms = asset.require("../transforms")
 asset.require("spice/base")
 asset.require("./trail")
-local kernel = asset.require("../kernels").jup310
+local kernel = asset.require("../kernels").jup365
 
 local labelsPath = asset.syncedResource({
   Name = "Jupiter Labels",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
index 3c963617bb..4b75ba1f8d 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 @@
 local transforms = asset.require("../transforms")
 asset.require("spice/base")
-local kernel = asset.require("../kernels").jup310
+local kernel = asset.require("../kernels").jup365
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
index cbc3414775..f8aa9766e9 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/kernels.asset
@@ -2,11 +2,12 @@ local Kernels = asset.syncedResource({
   Name = "Jupiter Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "jupiter_kernels",
-  Version = 1
+  Version = 2
 })
 
-asset.export("jup310", Kernels .. "jup310.bsp")
-asset.export("jup341", Kernels .. "jup341.bsp")
+asset.export("jup344", Kernels .. "jup344.bsp")
+asset.export("jup346", Kernels .. "jup346.bsp")
+asset.export("jup365", Kernels .. "jup365.bsp")
 
 
 asset.meta = {
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 0db8004434..f77e5c80e6 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
@@ -1,6 +1,7 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").jup341
+local kernel = asset.require("../kernels").jup344
+local kernel346 = asset.require("../kernels").jup346
 
 
 
@@ -92,7 +93,7 @@ local anankeGroup = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "55068",
+    Spice = "55506",
     Radii = { 2000, 2000, 2000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -205,6 +206,168 @@ local anankeGroup = {
     TrailColor = trailColor,
     OrbitPeriod = 640.38,
     Kernels = kernel
+  },
+  {
+    Identifier = "S2021J1",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55512",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2021 J 1",
+      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 606.99,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2021J2",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55513",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2021 J 2",
+      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 627.96,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2021J3",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55514",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2021 J 3",
+      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 643.85,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2022J3",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55523",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2022 J 3",
+      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 617.82,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2017J3",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "564",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2017 J 3",
+      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 606.3,
+    Kernels = kernel
+  },
+  {
+    Identifier = "S2017J7",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "568",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2017 J 7",
+      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 602.6,
+    Kernels = kernel
+  },
+  {
+    Identifier = "S2017J9",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "570",
+    Radii = { 3000, 3000, 3000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2017 J 9",
+      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 639.2,
+    Kernels = kernel
+  },
+  {
+    Identifier = "S2003J2",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55501",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2003 J 2",
+      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 602.02,
+    Kernels = kernel
+  },
+  {
+    Identifier = "S2003J12",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55505",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2003 J 12",
+      Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 646.64,
+    Kernels = kernel
   }
 }
 
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 683cf0c489..90763e4a77 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
@@ -1,6 +1,7 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").jup341
+local kernel = asset.require("../kernels").jup344
+local kernel346 = asset.require("../kernels").jup346
 
 
 
@@ -273,6 +274,240 @@ local carmeGroup = {
     TrailColor = trailColor,
     OrbitPeriod = 758.34,
     Kernels = kernel
+  },
+  {
+    Identifier = "S2018J3",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55511",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2018 J 3",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 704.56,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2021J4",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55515",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2021 J 4",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 710.13,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2021J5",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55516",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2021 J 5",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 704.80,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2021J6",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55517",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2021 J 6",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 732.55,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2016J3",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55518",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2016 J 3",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 676.37,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2022J1",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55521",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2022 J 1",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 667.34,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2022J2",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55522",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2022 J 2",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 685.51,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2017J2",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "563",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2017 J 2",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 723.1,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2017J5",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "566",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2017 J 5",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 719.5,
+    Kernels = kernel
+  },
+  {
+    Identifier = "S2017J8",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "569",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2017 J 8",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 719.6,
+    Kernels = kernel
+  },
+  {
+    Identifier = "S2011J1",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "572",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2011 J 1",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 686.6,
+    Kernels = kernel
+  },
+  {
+    Identifier = "S2003J9",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55503",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2003 J 9",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 767.6,
+    Kernels = kernel
+  },
+  {
+    Identifier = "S2003J10",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55504",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2003 J 10",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 705.96,
+    Kernels = kernel
   }
 }
 
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 24834899a0..f6f721bd4a 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
@@ -1,6 +1,7 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").jup341
+local kernel = asset.require("../kernels").jup344
+local kernel346 = asset.require("../kernels").jup346
 
 
 
@@ -33,6 +34,24 @@ local carpoGroup = {
     TrailColor = trailColor,
     OrbitPeriod = 458.62,
     Kernels = kernel
+  },
+  {
+    Identifier = "S2018J4",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55520",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2018 J 4",
+      Path = "/Solar System/Planets/Jupiter/Moons/Carpo Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 427.631,
+    Kernels = kernel346
   }
 }
 
@@ -67,7 +86,7 @@ for i, moon in ipairs(carpoGroup) do
   }
 
   -- 'Hacky' solution to case where the main label gets culled on approach due to its onscreen size.
-  -- We need the size of the original label to be big as it needs to be legible from long distances when focusing on Jupiter. 
+  -- We need the size of the original label to be big as it needs to be legible from long distances when focusing on Jupiter.
   moon_labels[i+1] = {
     Identifier = moon.Identifier .. "LabelNear",
     Parent = moon.Identifier,
@@ -96,7 +115,7 @@ end
 
 local nodes = proceduralGlobes.createGlobes(carpoGroup)
 
-asset.onInitialize(function() 
+asset.onInitialize(function()
   for _, node in ipairs(nodes) do
     openspace.addSceneGraphNode(node)
   end
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 e66ae2fa9c..906bbd179d 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
@@ -1,6 +1,7 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").jup341
+local kernel = asset.require("../kernels").jup344
+local kernel346 = asset.require("../kernels").jup346
 
 
 
@@ -91,8 +92,7 @@ local himaliaGroup = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    -- Spice = "DIA", -- The Identifier is not correctly registered in the Spice kernel
-    Spice = "553",
+    Spice = "DIA",
     Radii = { 4000, 4000, 4000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -102,6 +102,76 @@ local himaliaGroup = {
     TrailColor = trailColor,
     OrbitPeriod = 287.93,
     Kernels = kernel
+  },
+  {
+    Identifier = "S2011J3",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55509",
+    Radii = { 3000, 3000, 3000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2011 J 3",
+      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 261.77,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2018J2",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55510",
+    Radii = { 3000, 3000, 3000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2018 J 2",
+      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 250.88,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "Pandia",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "565",
+    Radii = { 3000, 3000, 3000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 251.911,
+    Kernels = kernel
+  },
+  {
+    Identifier = "Ersa",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "571",
+    Radii = { 3000, 3000, 3000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 249.229,
+    Kernels = kernel
   }
 }
 
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 b1bb9b4749..17524a2be7 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
@@ -1,6 +1,6 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").jup341
+local kernel = asset.require("../kernels").jup365
 
 
 
@@ -137,7 +137,7 @@ asset.onDeinitialize(function()
   for i = #moon_labels, 1, -1 do
     openspace.removeSceneGraphNode(moon_labels[i])
   end
-  
+
   for i = #nodes, 1, -1 do
     openspace.removeSceneGraphNode(nodes[i])
   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 ca46e4a280..75f6a0e8ce 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
@@ -1,6 +1,6 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").jup341
+local kernel = asset.require("../kernels").jup344
 
 
 
@@ -18,57 +18,21 @@ local trailTags = {
 
 local otherGroups = {
   {
-    Identifier = "S2003J12",
+    Identifier = "Eupheme",
     Parent = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "55066",
-    Radii = { 1000, 1000, 1000 },
-    Tags = tags,
-    TrailTags = trailTags,
-    GUI = {
-      Name = "S/2003 J 12",
-      Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
-    },
-    TrailColor = trailColor,
-    OrbitPeriod = 482.69,
-    Kernels = kernel
-  },
-  {
-    Identifier = "S/2003J3",
-    Parent = {
-      Identifier = parentIdentifier,
-      Spice = parentSpice
-    },
-    Spice = "55061",
+    Spice = "560",
     Radii = { 2000, 2000, 2000 },
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Name = "S/2003 J 3",
+      Name = "Eupheme",
       Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
     },
     TrailColor = trailColor,
-    OrbitPeriod = 561.52,
-    Kernels = kernel
-  },
-  {
-    Identifier = "S2011J1",
-    Parent = {
-      Identifier = parentIdentifier,
-      Spice = parentSpice
-    },
-    Spice = "55074",
-    Radii = { 1000, 1000, 1000 },
-    Tags = tags,
-    TrailTags = trailTags,
-    GUI = {
-      Name = "S/2011 J 1",
-      Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
-    },
-    TrailColor = trailColor,
-    OrbitPeriod = 582.22,
+    OrbitPeriod = 628.06,
     Kernels = kernel
   },
   {
@@ -77,7 +41,7 @@ local otherGroups = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "55070",
+    Spice = "561",
     Radii = { 2000, 2000, 2000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -90,75 +54,21 @@ local otherGroups = {
     Kernels = kernel
   },
   {
-    Identifier = "S2003J10",
+    Identifier = "Valetudo",
     Parent = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "55065",
-    Radii = { 2000, 2000, 2000 },
+    Spice = "562",
+    Radii = { 1000, 1000, 1000 },
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Name = "S/2003 J 10",
+      Name = "Valetudo",
       Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
     },
     TrailColor = trailColor,
-    OrbitPeriod = 700.13,
-    Kernels = kernel
-  },
-  {
-    Identifier = "S2003J23",
-    Parent = {
-      Identifier = parentIdentifier,
-      Spice = parentSpice
-    },
-    Spice = "55071",
-    Radii = { 2000, 2000, 2000 },
-    Tags = tags,
-    TrailTags = trailTags,
-    GUI = {
-      Name = "S/2003 J 23",
-      Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
-    },
-    TrailColor = trailColor,
-    OrbitPeriod = 700.54,
-    Kernels = kernel
-  },
-  {
-    Identifier = "S2003J9",
-    Parent = {
-      Identifier = parentIdentifier,
-      Spice = parentSpice
-    },
-    Spice = "55064",
-    Radii = { 2000, 2000, 2000 },
-    Tags = tags,
-    TrailTags = trailTags,
-    GUI = {
-      Name = "S/2003 J 9",
-      Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
-    },
-    TrailColor = trailColor,
-    OrbitPeriod = 752.84,
-    Kernels = kernel
-  },
-  {
-    Identifier = "S2003J2",
-    Parent = {
-      Identifier = parentIdentifier,
-      Spice = parentSpice
-    },
-    Spice = "55060",
-    Radii = { 2000, 2000, 2000 },
-    Tags = tags,
-    TrailTags = trailTags,
-    GUI = {
-      Name = "S/2003 J 2",
-      Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
-    },
-    TrailColor = trailColor,
-    OrbitPeriod = 981.55,
+    OrbitPeriod = 527.41,
     Kernels = kernel
   }
 }
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 0fbf568e03..95f6a304ea 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
@@ -1,6 +1,7 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").jup341
+local kernel = asset.require("../kernels").jup344
+local kernel346 = asset.require("../kernels").jup346
 
 
 
@@ -248,7 +249,7 @@ local pasiphaeGroup = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "55062",
+    Spice = "55502",
     Radii = { 2000, 2000, 2000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -361,6 +362,60 @@ local pasiphaeGroup = {
     TrailColor = trailColor,
     OrbitPeriod = 792.44,
     Kernels = kernel
+  },
+  {
+    Identifier = "S2016J4",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55519",
+    Radii = { 1000, 1000, 1000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2016 J 4",
+      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 743.69,
+    Kernels = kernel346
+  },
+  {
+    Identifier = "S2017J6",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "567",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2017 J 6",
+      Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 683.0,
+    Kernels = kernel
+  },
+  {
+    Identifier = "S2003J23",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "55507",
+    Radii = { 2000, 2000, 2000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2003 J 23",
+      Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 792.00,
+    Kernels = kernel
   }
 }
 
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 5656a8e53f..efa7f6b7f9 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
@@ -1,6 +1,6 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").jup341
+local kernel = asset.require("../kernels").jup344
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
index 8bcf2aa6ee..8d98f3d84b 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset
@@ -9,7 +9,7 @@ asset.require("./minor/themisto_group")
 
 local minormoons_on = {
   Identifier = "os.solarsystem.jupiter.minormoonson",
-  Name = "Turn ON minor moons and trails",
+  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');
@@ -17,14 +17,14 @@ local minormoons_on = {
     local moons = openspace.getProperty('{moon_minor_jupiter}.Renderable.Enabled');
     local moons_fade = openspace.getProperty('{moon_minor_jupiter}.Renderable.Fade');
 
-    for i, v in pairs(trails_fade) do 
+    for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
-      openspace.setPropertyValueSingle(v, 1, 2, 'Linear') 
+      openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
     end
 
-    for i, v in pairs(moons_fade) do 
+    for i, v in pairs(moons_fade) do
       openspace.setPropertyValueSingle(moons[i], true)
-      openspace.setPropertyValueSingle(v, 1, 2, 'Linear') 
+      openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
     end
   ]],
   Documentation = "Turn ON Jupiter's minor moons and their trails",
@@ -34,7 +34,7 @@ local minormoons_on = {
 
 local minormoons_off = {
   Identifier = "os.solarsystem.jupiter.minormoonsoff",
-  Name = "Turn OFF minors moon and trails",
+  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');
@@ -42,12 +42,12 @@ local minormoons_off = {
     local moons = openspace.getProperty('{moon_minor_jupiter}.Renderable.Enabled');
     local moons_fade = openspace.getProperty('{moon_minor_jupiter}.Renderable.Fade');
 
-    for i, v in pairs(trails_fade) do 
-      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" ) 
+    for i, v in pairs(trails_fade) do
+      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" )
     end
 
     for i, v in pairs(moons_fade) do
-      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" ) 
+      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" )
     end
   ]],
   Documentation = "Turn OFF Jupiter's minor moons and their trails",
diff --git a/data/assets/scene/solarsystem/planets/mars/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/default_layers.asset
index 92b856d860..f3390997c6 100644
--- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset
@@ -14,7 +14,7 @@ asset.require("./layers/colorlayers/themis_ir_night_utah", false)
 asset.require("./layers/colorlayers/themis_ir_night_sweden", false)
 asset.require("./layers/colorlayers/ctx_mosaic_utah", false)
 asset.require("./layers/colorlayers/ctx_mosaic_sweden", false)
-asset.require("./layers/colorlayers/ctx_blended_01", false)
+asset.require("./layers/colorlayers/ctx_blended", false)
 asset.require("./layers/colorlayers/hirise", false)
 asset.require("./layers/colorlayers/hirisels", false)
 
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
new file mode 100644
index 0000000000..4df28544f5
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.asset
@@ -0,0 +1,36 @@
+local globeIdentifier = asset.require("../../mars").Mars.Identifier
+
+local layer = {
+  Identifier = "CTX_blended",
+  Name = "CTX Blended",
+  Enabled = asset.enabled,
+  FilePath = asset.localResource("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 mosaic is about the size of a typical parking space, providing unprecedented resolution of the martian surface at the global scale.
+
+  The mosaic covers 99.5% of Mars from 88°S to 88°N. The pixels that make up the mosaic can all be mapped back to their source data, providing full traceability for the entire mosaic. The mosaic is available to stream over the internet and to download, as described below.
+
+  All data in the mosaic come from the Context Camera (CTX) onboard the Mars Reconnaissance Orbiter (MRO). (Description from URL)]]
+}
+
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+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",
+  URL = "http://murray-lab.caltech.edu/CTX/",
+  License = "Esri Master License Agreement"
+}
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.vrt b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.vrt
similarity index 90%
rename from data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.vrt
rename to data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.vrt
index ed8fb78132..342a7ad608 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.vrt
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.vrt
@@ -5,7 +5,7 @@
     <NoDataValue>0.00000000000000E+00</NoDataValue>
     <ColorInterp>Gray</ColorInterp>
     <ComplexSource>
-      <SourceFilename relativeToVRT="1">ctx_blended_01.wms</SourceFilename>
+      <SourceFilename relativeToVRT="1">ctx_blended.wms</SourceFilename>
       <SourceBand>1</SourceBand>
       <SourceProperties RasterXSize="4194304" RasterYSize="2097152" DataType="Byte" BlockXSize="512" BlockYSize="512" />
       <SrcRect xOff="0" yOff="0" xSize="4194304" ySize="2097152" />
@@ -17,7 +17,7 @@
     <NoDataValue>0</NoDataValue>
     <ColorInterp>Alpha</ColorInterp>
     <ComplexSource>
-      <SourceFilename relativeToVRT="1">ctx_blended_01.wms</SourceFilename>
+      <SourceFilename relativeToVRT="1">ctx_blended.wms</SourceFilename>
       <SourceBand>1</SourceBand>
       <SourceProperties RasterXSize="4194304" RasterYSize="2097152" DataType="Byte" BlockXSize="512" BlockYSize="512" />
       <SrcRect xOff="0" yOff="0" xSize="4194304" ySize="2097152" />
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.wms b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.wms
new file mode 100644
index 0000000000..cb5c3f9598
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended.wms
@@ -0,0 +1,22 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>https://astro.arcgis.com/arcgis/rest/services/OnMars/CTX1/raw/tile/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90.0</UpperLeftY>
+    <LowerRightX>180.0</LowerRightX>
+    <LowerRightY>-90.0</LowerRightY>
+    <SizeX>4194304</SizeX>
+    <SizeY>2097152</SizeY>
+    <TileLevel>12</TileLevel>
+    <YOrigin>top</YOrigin>
+  </DataWindow>
+  <Projection>GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</Projection>
+  <BlockSizeX>512</BlockSizeX>
+  <BlockSizeY>512</BlockSizeY>
+  <BandsCount>1</BandsCount>
+  <MaxConnections>5</MaxConnections>
+  <DataValues NoData="0"></DataValues>
+  <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
similarity index 97%
rename from data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset
rename to data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
index 884991fc0b..e4e4f48944 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.asset
@@ -4,7 +4,7 @@ local layer = {
   Identifier = "CTX_blended_01",
   Name = "CTX Blended beta01",
   Enabled = asset.enabled,
-  FilePath = asset.localResource("ctx_blended_01.vrt"),
+  FilePath = asset.localResource("ctx_blended_beta01.vrt"),
   BlendMode = "Color",
   Settings = {
     Gamma = 2.14,
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.vrt b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.vrt
new file mode 100644
index 0000000000..5b4b29aa85
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.vrt
@@ -0,0 +1,28 @@
+<VRTDataset rasterXSize="11534336" rasterYSize="2097152">
+  <SRS>GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</SRS>
+  <GeoTransform> -8.1000000000000000e+02,  8.5830688476562500e-05,  0.0000000000000000e+00,  9.0000000000000000e+01,  0.0000000000000000e+00, -8.5830688476562500e-05</GeoTransform>
+  <VRTRasterBand dataType="Byte" band="1">
+    <NoDataValue>0.00000000000000E+00</NoDataValue>
+    <ColorInterp>Gray</ColorInterp>
+    <ComplexSource>
+      <SourceFilename relativeToVRT="1">ctx_blended_beta01.wms</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SourceProperties RasterXSize="4194304" RasterYSize="2097152" DataType="Byte" BlockXSize="512" BlockYSize="512" />
+      <SrcRect xOff="0" yOff="0" xSize="4194304" ySize="2097152" />
+      <DstRect xOff="7340032" yOff="0" xSize="4194304" ySize="2097152" />
+      <NODATA>0</NODATA>
+    </ComplexSource>
+  </VRTRasterBand>
+  <VRTRasterBand dataType="Byte" band="2">
+    <NoDataValue>0</NoDataValue>
+    <ColorInterp>Alpha</ColorInterp>
+    <ComplexSource>
+      <SourceFilename relativeToVRT="1">ctx_blended_beta01.wms</SourceFilename>
+      <SourceBand>1</SourceBand>
+      <SourceProperties RasterXSize="4194304" RasterYSize="2097152" DataType="Byte" BlockXSize="512" BlockYSize="512" />
+      <SrcRect xOff="0" yOff="0" xSize="4194304" ySize="2097152" />
+      <DstRect xOff="7340032" yOff="0" xSize="4194304" ySize="2097152" />
+ <LUT>0:0,1:255,255:255</LUT>
+    </ComplexSource>
+  </VRTRasterBand>
+</VRTDataset>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.wms b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.wms
similarity index 71%
rename from data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.wms
rename to data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.wms
index 28ea11c342..fb7677b04f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_beta01.wms
@@ -3,10 +3,14 @@
     <ServerUrl>http://astro.arcgis.com/arcgis/rest/services/OnMars/CTX/MapServer/tile/${z}/${y}/${x}</ServerUrl>
   </Service>
   <DataWindow>
-    <UpperLeftX>-180.0</UpperLeftX> <UpperLeftY>90.0</UpperLeftY>
-    <LowerRightX>180.0</LowerRightX> <LowerRightY>-90.0</LowerRightY>
-    <SizeX>4194304</SizeX> <SizeY>2097152</SizeY>
-    <TileLevel>12</TileLevel> <YOrigin>top</YOrigin>
+    <UpperLeftX>-180.0</UpperLeftX>
+    <UpperLeftY>90.0</UpperLeftY>
+    <LowerRightX>180.0</LowerRightX>
+    <LowerRightY>-90.0</LowerRightY>
+    <SizeX>4194304</SizeX>
+    <SizeY>2097152</SizeY>
+    <TileLevel>12</TileLevel>
+    <YOrigin>top</YOrigin>
   </DataWindow>
   <Projection>GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</Projection>
   <BlockSizeX>512</BlockSizeX>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC/Martian_Path_Eastern_Section_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC/Martian_Path_Eastern_Section_DEM.wms
index 5f3a91666d..8750677b2d 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC/Martian_Path_Eastern_Section_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC/Martian_Path_Eastern_Section_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC/Martian_Path_MC11_Quad_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC/Martian_Path_MC11_Quad_DEM.wms
index 04482affb1..9e5c6a19dd 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC/Martian_Path_MC11_Quad_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MEX_HRSC/Martian_Path_MC11_Quad_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas/Global_Color_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas/Global_Color_Mosaic.wms
index ba4a1ddfef..1b1af4506a 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas/Global_Color_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOC_Atlas/Global_Color_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
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 896f7a26d2..1c052b65d4 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
@@ -19,11 +19,11 @@ 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"),
-  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. 
+  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. 
+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.
 
-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.]]
+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.]]
 }
 
 local treks_mola_roughness = {
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_Color_Hillshade.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_Color_Hillshade.wms
index 964a6a5a11..8ed3d0542c 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_Color_Hillshade.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_Color_Hillshade.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_DEM.wms
index 7caaba49f0..95ed3b5e55 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_Surface_Roughness.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_Surface_Roughness.wms
index 6e09fdb7e0..809e423b91 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_Surface_Roughness.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA/Global_Surface_Roughness.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
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 64e7eec5c4..e68e1850b3 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
@@ -10,26 +10,26 @@ 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"),
-  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.
+  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.
 
 HRSC, the only dedicated stereo camera orbiting Mars, is a multi-sensor push broom instrument comprising 9 CCD line sensors mounted in parallel for simultaneous high-resolution stereo, multicolor and multi-phase imaging by delivering 9 superimposed image swaths. The HRSC design permits stereo imaging with triple to quintuple panchromatic along-track stereo including a nadir-directed, forward and aft-looking (+/-18.91), and 2 inner (+/-12.81) stereo line sensors. The along-track acquisition of stereo imagery avoids changes in atmospheric and illumination conditions. The sub-pixel accuracy of the three-dimensional point determination allows the derivation of digital terrain models DTMs with a grid size of up to 50 m and a height accuracy of a single pixel with up to 10 m.
 
-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]]
+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]]
 }
 
 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"),
-  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.
+  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.
 
 HRSC, the only dedicated stereo camera orbiting Mars, is a multi-sensor push broom instrument comprising 9 CCD line sensors mounted in parallel for simultaneous high-resolution stereo, multicolor and multi-phase imaging by delivering 9 superimposed image swaths. The HRSC design permits stereo imaging with triple to quintuple panchromatic along-track stereo including a nadir-directed, forward and aft-looking (+/-18.91), and 2 inner (+/-12.81) stereo line sensors. The along-track acquisition of stereo imagery avoids changes in atmospheric and illumination conditions. The sub-pixel accuracy of the three-dimensional point determination allows the derivation of digital terrain models DTMs with a grid size of up to 50 m and a height accuracy of a single pixel with up to 10 m.
 
-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]]
+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()
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC/Color_Hillshade_Blend.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC/Color_Hillshade_Blend.wms
index e68f776897..0072ffd76f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC/Color_Hillshade_Blend.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC/Color_Hillshade_Blend.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC/Hillshade_Blend.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC/Hillshade_Blend.wms
index 3eb3e23210..1d82f32b89 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC/Hillshade_Blend.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_MOLA_and_Mars_Express_HRSC/Hillshade_Blend.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Dust.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Dust.wms
index 88245fcb8d..bb998676b5 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Dust.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Dust.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Dust_Index.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Dust_Index.wms
index 39870e58fd..354787c93b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Dust_Index.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Dust_Index.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_High-Ca_Pyroxene_Abundance.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_High-Ca_Pyroxene_Abundance.wms
index 2c65d42995..97eb22fc51 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_High-Ca_Pyroxene_Abundance.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_High-Ca_Pyroxene_Abundance.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Plagioclase_Abundance.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Plagioclase_Abundance.wms
index 0dc77e38ab..ab286cffe0 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Plagioclase_Abundance.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Plagioclase_Abundance.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Sheet_SilicatesHigh-Si_Glass.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Sheet_SilicatesHigh-Si_Glass.wms
index a28f1e64ef..88026d2be1 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Sheet_SilicatesHigh-Si_Glass.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Sheet_SilicatesHigh-Si_Glass.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Thermal_Inertia.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Thermal_Inertia.wms
index 4dab1db222..07148e3fc7 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Thermal_Inertia.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MGS_TES/Global_Thermal_Inertia.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day/Global_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day/Global_Mosaic.wms
index bc271bbcac..2f119065fe 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day/Global_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Day/Global_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night/Global_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night/Global_Mosaic.wms
index 3c5bb428e2..924ac76f36 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night/Global_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MO_THEMIS-IR_Night/Global_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
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 270d2cdcc5..66362550a2 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
@@ -321,7 +321,7 @@ 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"),
-  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.  
+  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/.
 
@@ -342,7 +342,7 @@ local treks_olympus_monseq = {
   FilePath = asset.localResource("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.    
+ of image boundaries.
 reference:
 Dickson et al. 2018 LPSC programs with abstracts https://www.hou.usra.edu/meetings/lpsc2018/pdf/2480.pdf]]
 }
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/22n048w_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/22n048w_Mosaic.wms
index 15d7e8c17e..0a4d0c9249 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/22n048w_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/22n048w_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Acheron_Fossae_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Acheron_Fossae_Mosaic.wms
index 483ad0ea48..d53e1109d5 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Acheron_Fossae_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Acheron_Fossae_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Acidalia_Plantia_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Acidalia_Plantia_Mosaic.wms
index 0abf0a932f..d2239eea0f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Acidalia_Plantia_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Acidalia_Plantia_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arabia_Terra_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arabia_Terra_Mosaic.wms
index 55d1dbc403..c01fa29123 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arabia_Terra_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arabia_Terra_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Aram_Chaos_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Aram_Chaos_Mosaic.wms
index 0b7286609a..9908d851d4 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Aram_Chaos_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Aram_Chaos_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arcadia_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arcadia_Mosaic.wms
index c52b78e25f..8a6390f9ae 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arcadia_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arcadia_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arcadia_Planitia_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arcadia_Planitia_Mosaic.wms
index 1ec1560188..3e0504c866 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arcadia_Planitia_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Arcadia_Planitia_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Ausonia_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Ausonia_Mosaic.wms
index 12fe8b9aa5..145aef441f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Ausonia_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Ausonia_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Cerberus_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Cerberus_Mosaic.wms
index 113c83d3a9..be42ae952c 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Cerberus_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Cerberus_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Columbia_Hills_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Columbia_Hills_DEM.wms
index 1392c26833..6018eb74ce 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Columbia_Hills_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Columbia_Hills_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Columbus_Crater_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Columbus_Crater_Mosaic.wms
index 7a5814a26c..83478b1f2e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Columbus_Crater_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Columbus_Crater_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Copernicus_Crater_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Copernicus_Crater_Mosaic.wms
index f9be291532..2bfebe65cd 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Copernicus_Crater_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Copernicus_Crater_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Coprates_EMelas_Chasm_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Coprates_EMelas_Chasm_Mosaic.wms
index aa8c27189a..9e9329b3d2 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Coprates_EMelas_Chasm_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Coprates_EMelas_Chasm_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Curiosity_Roving_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Curiosity_Roving_Site_Mosaic.wms
index 5df9b61dfe..321eeaa976 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Curiosity_Roving_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Curiosity_Roving_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Deuteronilus_Mensae_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Deuteronilus_Mensae_Mosaic.wms
index 50daead5d2..4daf0fd215 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Deuteronilus_Mensae_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Deuteronilus_Mensae_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/East_Melas_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/East_Melas_DEM.wms
index 5077517cfd..effefc2ca0 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/East_Melas_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/East_Melas_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/East_Melas_Hillshade.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/East_Melas_Hillshade.wms
index 94232e1ffe..468cb07d01 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/East_Melas_Hillshade.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/East_Melas_Hillshade.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Eastern_Valles_Marineris_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Eastern_Valles_Marineris_Mosaic.wms
index c82de2e267..d22e6745c6 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Eastern_Valles_Marineris_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Eastern_Valles_Marineris_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Equatorial_Valles_Marineries_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Equatorial_Valles_Marineries_Mosaic.wms
index 38bdfe1e92..0851536c01 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Equatorial_Valles_Marineries_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Equatorial_Valles_Marineries_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Erebus_Montes_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Erebus_Montes_Mosaic.wms
index 41cc106983..0bd2377888 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Erebus_Montes_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Erebus_Montes_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Gale_Crater_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Gale_Crater_Mosaic.wms
index dcfd94bdfa..73e1e2a967 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Gale_Crater_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Gale_Crater_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Gusev_Crater_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Gusev_Crater_Mosaic.wms
index d236a4ad8b..a2a205e365 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Gusev_Crater_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Gusev_Crater_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hadriacus_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hadriacus_Mosaic.wms
index 63bb6bcad6..d13494d7f5 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hadriacus_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hadriacus_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hale_Crater_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hale_Crater_Mosaic.wms
index 986e44b1ef..0494367d2c 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hale_Crater_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hale_Crater_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hebrus_Valles_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hebrus_Valles_Mosaic.wms
index ae59f39592..a66992593a 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hebrus_Valles_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hebrus_Valles_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hellas_Eastern_Rim_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hellas_Eastern_Rim_Mosaic.wms
index 55055c87ed..17d241d42d 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hellas_Eastern_Rim_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hellas_Eastern_Rim_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hellas_Mesopotamia_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hellas_Mesopotamia_Mosaic.wms
index 55da0469b9..96086258ed 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hellas_Mesopotamia_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hellas_Mesopotamia_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Huygens_Crater_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Huygens_Crater_Mosaic.wms
index a244d9a51f..c60937f793 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Huygens_Crater_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Huygens_Crater_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hypanis_Delta_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hypanis_Delta_Mosaic.wms
index 16555e1176..196faae383 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hypanis_Delta_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Hypanis_Delta_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Ismenius_Cavus_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Ismenius_Cavus_Mosaic.wms
index c93bfb8585..0ffe545a47 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Ismenius_Cavus_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Ismenius_Cavus_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Jezero_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Jezero_Mosaic.wms
index ebe35d4904..25d404990e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Jezero_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Jezero_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Kasei_Valles_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Kasei_Valles_Mosaic.wms
index 5a468d7303..1b32604999 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Kasei_Valles_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Kasei_Valles_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mawrth_Vallis_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mawrth_Vallis_Mosaic.wms
index 5027627379..69c99d04c1 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mawrth_Vallis_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mawrth_Vallis_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/McLaughlin_Crater_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/McLaughlin_Crater_Mosaic.wms
index d0dbcd14cc..cb8736881d 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/McLaughlin_Crater_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/McLaughlin_Crater_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Meridiani_Planum_-_Sinus_Meridiani_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Meridiani_Planum_-_Sinus_Meridiani_Mosaic.wms
index 8f7f27133d..e3c9500414 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Meridiani_Planum_-_Sinus_Meridiani_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Meridiani_Planum_-_Sinus_Meridiani_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_Global_Uncontrolled_Caltech.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_Global_Uncontrolled_Caltech.wms
index eecc74f939..b7d430f194 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_Global_Uncontrolled_Caltech.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_Global_Uncontrolled_Caltech.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_InSight.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_InSight.wms
index 4c9d0570ff..d1eaae4966 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_InSight.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_InSight.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_Olympus_Mons.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_Olympus_Mons.wms
index e523ebfb27..3596b51f3e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_Olympus_Mons.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Mosaic_Olympus_Mons.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Newton_Crater_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Newton_Crater_Mosaic.wms
index 263aabc95a..93490c747d 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Newton_Crater_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Newton_Crater_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Noctis_Landing_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Noctis_Landing_Mosaic.wms
index f2e978554b..0a1d81a5b8 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Noctis_Landing_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Noctis_Landing_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Protonilus_Mensae_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Protonilus_Mensae_Mosaic.wms
index 99d25c03ef..c581f1e852 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Protonilus_Mensae_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Protonilus_Mensae_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Southern_Nectaris_Fossae_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Southern_Nectaris_Fossae_Mosaic.wms
index b73dc83e33..00a3e483b3 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Southern_Nectaris_Fossae_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Southern_Nectaris_Fossae_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Victoria_Crater_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Victoria_Crater_DEM.wms
index ad2e294fc9..14160bd43d 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Victoria_Crater_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Victoria_Crater_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Viking_1_Landing_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Viking_1_Landing_Site_Mosaic.wms
index c74c755ea3..6ef2a38f78 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Viking_1_Landing_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Viking_1_Landing_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Viking_2_Landing_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Viking_2_Landing_Site_Mosaic.wms
index 715021f563..edb6ad2251 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Viking_2_Landing_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Viking_2_Landing_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/West_Candor_Chasma_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/West_Candor_Chasma_Mosaic.wms
index 16b50ca5ba..10a9ee8fa4 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/West_Candor_Chasma_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/West_Candor_Chasma_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/West_Candor_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/West_Candor_DEM.wms
index 30208245bb..0b7f3f0e4c 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/West_Candor_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/West_Candor_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Western_Noachis_Terra_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Western_Noachis_Terra_Mosaic.wms
index a1a439feef..51cf42f769 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Western_Noachis_Terra_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Western_Noachis_Terra_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Zephyria_Planum_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Zephyria_Planum_Mosaic.wms
index 88ad399ea6..7e1cb9d0cd 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Zephyria_Planum_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_CTX/Zephyria_Planum_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
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 1a153032de..cbb6529f34 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
@@ -102,11 +102,11 @@ local treks_CLH_Visible_Mosaic_HiRISE_CTX_HRSC_GCS_MARS_07102018 = {
   FilePath = asset.localResource("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, 
-Heather Lethcoe-Wilson, Lauren Berger, Marshall Trautman, and Matt Golombek for the M2020 Council of Terrains. These files are for discussion and planning purposes 
+and compiled and georeferenced at JPL/Caltech by the Advanced Laboratory for Landing Site Terrain Analysis and Reconnaissance (ALLSTAR) group including Nathan Williams,
+Heather Lethcoe-Wilson, Lauren Berger, Marshall Trautman, and Matt Golombek for the M2020 Council of Terrains. These files are for discussion and planning purposes
 only.
 Processing Notes:
-Georeferencing: 
+Georeferencing:
 HRSC orthos are well-coregistered to the community-standard MOLA global topography products, and CTX orthos are well-coregistered to the HRSC orthos.
 Tie points were recorded at small craters visible in both HiRISE and CTX images, and a first-order transformation was used to rectify the HiRISE.
 
@@ -115,15 +115,14 @@ Former mosaic basemaps for M2020 used a Mars equirectangular projection with a s
 but this caused a ~5% latitude vs longitude distortion at the remaining 3 candidate landing sites such that true circles would appear elliptical.
 In this new version of basemaps, we use a Mars equirectangular projection with customized standard parallels for each site to reduce distortion to <1%.
 Specifically, Columbia Hills uses a standard parallel of -14.5 degrees, while Jezero and NE Syrtis both have a standard parallel of +18 degrees. Projection (.prj) files are included with this delivery.
-When analyzing images, please ensure that the correct projection system is being used. For example, there is a known issue with Matlab where reading images in as a geotiff may automatically assign an 
-incorrect projection without the specified standard parallel, which then produces distorted linear (in meters) x/y values.]]
+When analyzing images, please ensure that the correct projection system is being used. For example, there is a known issue with Matlab where reading images in as a geotiff may automatically assign an incorrect projection without the specified standard parallel, which then produces distorted linear (in meters) x/y values.]]
 }
 
 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"),
-  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.]]
+  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 = {
@@ -132,11 +131,11 @@ local treks_NES_JEZ_MID_Visible_Mosaic_HiRISE_CTX_HRSC_GCS_MARS_07102018 = {
   FilePath = asset.localResource("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, 
-Heather Lethcoe-Wilson, Lauren Berger, Marshall Trautman, and Matt Golombek for the M2020 Council of Terrains. These files are for discussion and planning purposes 
+and compiled and georeferenced at JPL/Caltech by the Advanced Laboratory for Landing Site Terrain Analysis and Reconnaissance (ALLSTAR) group including Nathan Williams,
+Heather Lethcoe-Wilson, Lauren Berger, Marshall Trautman, and Matt Golombek for the M2020 Council of Terrains. These files are for discussion and planning purposes
 only.
 Processing Notes:
-Georeferencing: 
+Georeferencing:
 HRSC orthos are well-coregistered to the community-standard MOLA global topography products, and CTX orthos are well-coregistered to the HRSC orthos.
 Tie points were recorded at small craters visible in both HiRISE and CTX images, and a first-order transformation was used to rectify the HiRISE.
 
@@ -145,8 +144,7 @@ Former mosaic basemaps for M2020 used a Mars equirectangular projection with a s
 but this caused a ~5% latitude vs longitude distortion at the remaining 3 candidate landing sites such that true circles would appear elliptical.
 In this new version of basemaps, we use a Mars equirectangular projection with customized standard parallels for each site to reduce distortion to <1%.
 Specifically, Columbia Hills uses a standard parallel of -14.5 degrees, while Jezero and NE Syrtis both have a standard parallel of +18 degrees. Projection (.prj) files are included with this delivery.
-When analyzing images, please ensure that the correct projection system is being used. For example, there is a known issue with Matlab where reading images in as a geotiff may automatically assign an 
-incorrect projection without the specified standard parallel, which then produces distorted linear (in meters) x/y values.]]
+When analyzing images, please ensure that the correct projection system is being used. For example, there is a known issue with Matlab where reading images in as a geotiff may automatically assign an incorrect projection without the specified standard parallel, which then produces distorted linear (in meters) x/y values.]]
 }
 
 local treks_HiRISE_Opportunity = {
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/001918_1735_001984_1735_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/001918_1735_001984_1735_DEM.wms
index 6cdee67aa2..2add732695 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/001918_1735_001984_1735_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/001918_1735_001984_1735_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/042014_1760_042647_1760_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/042014_1760_042647_1760_DEM.wms
index b54c237ddc..2394688b66 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/042014_1760_042647_1760_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/042014_1760_042647_1760_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/042753_1930_042252_1930_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/042753_1930_042252_1930_DEM.wms
index fb48df1b71..63ff63b7da 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/042753_1930_042252_1930_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/042753_1930_042252_1930_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/1183_0000_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/1183_0000_DEM.wms
index d1f83a20c8..f3218069a7 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/1183_0000_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/1183_0000_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Columbia_Hills_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Columbia_Hills_Mosaic.wms
index fb71791943..7c14ad5df6 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Columbia_Hills_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Columbia_Hills_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Curiosity_Roving_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Curiosity_Roving_Site_Mosaic.wms
index 629994cc7c..66660b7eb2 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Curiosity_Roving_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Curiosity_Roving_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Gale_Crater_DEM.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Gale_Crater_DEM.wms
index 7d39dd8d0e..922e4f0e39 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Gale_Crater_DEM.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Gale_Crater_DEM.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Marth_Crater_West_Rim_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Marth_Crater_West_Rim_Mosaic.wms
index a40a067b92..b042603b95 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Marth_Crater_West_Rim_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Marth_Crater_West_Rim_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Martian_Ares_3_Landing_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Martian_Ares_3_Landing_Site_Mosaic.wms
index f4de8e916a..98f4ee8bc9 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Martian_Ares_3_Landing_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Martian_Ares_3_Landing_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Martian_Ares_4_Landing_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Martian_Ares_4_Landing_Site_Mosaic.wms
index 3afe953569..2f704c0ab7 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Martian_Ares_4_Landing_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Martian_Ares_4_Landing_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Columbia_Hills.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Columbia_Hills.wms
index f847140b68..0f39d0e2ae 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Columbia_Hills.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Columbia_Hills.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Insight_Landing_Site.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Insight_Landing_Site.wms
index 8c9218b70d..fecb488232 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Insight_Landing_Site.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Insight_Landing_Site.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Jezero_NE_Syrtis_Midway.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Jezero_NE_Syrtis_Midway.wms
index 50e05abc65..74f0a2e413 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Jezero_NE_Syrtis_Midway.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Jezero_NE_Syrtis_Midway.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Opportunity.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Opportunity.wms
index 3c6fe5eac4..b4e00a13fd 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Opportunity.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Mosaic_Opportunity.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Opportunity_Roving_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Opportunity_Roving_Site_Mosaic.wms
index c5f740993b..f500f262d1 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Opportunity_Roving_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Opportunity_Roving_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Phoenix_Landing_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Phoenix_Landing_Site_Mosaic.wms
index 74f9f76cf5..e303b7d9dd 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Phoenix_Landing_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Phoenix_Landing_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Sojourner_Roving_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Sojourner_Roving_Site_Mosaic.wms
index 117f56fbfb..2289649a7b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Sojourner_Roving_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Sojourner_Roving_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Southwest_Candor_Chasma_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Southwest_Candor_Chasma_Mosaic.wms
index 1c70b7103c..6eb5f638f8 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Southwest_Candor_Chasma_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Southwest_Candor_Chasma_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Spirit_Roving_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Spirit_Roving_Site_Mosaic.wms
index d786da36d7..6d2c10debb 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Spirit_Roving_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Spirit_Roving_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Viking_1_Landing_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Viking_1_Landing_Site_Mosaic.wms
index 3b0fd9f494..b0ae05e4d8 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Viking_1_Landing_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Viking_1_Landing_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Viking_2_Landing_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Viking_2_Landing_Site_Mosaic.wms
index b6d343ff15..39f0bd1d2e 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Viking_2_Landing_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MRO_HiRISE/Viking_2_Landing_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL/Pahrump_Hills.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL/Pahrump_Hills.wms
index 6ec7a4f497..d8c5652ae7 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL/Pahrump_Hills.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/MSL/Pahrump_Hills.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_Eastern_Section_Color_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_Eastern_Section_Color_Mosaic.wms
index 3fbf9f63ff..2a40021fd6 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_Eastern_Section_Color_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_Eastern_Section_Color_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_MC11_Quad_Color_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_MC11_Quad_Color_Mosaic.wms
index bd8efc8ee4..855ad6ff92 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_MC11_Quad_Color_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_MC11_Quad_Color_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_MC11_Quad_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_MC11_Quad_Mosaic.wms
index a032504d7a..bfa1c296db 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_MC11_Quad_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Martian_Path_MC11_Quad_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Mawrth_Vallis_Color_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Mawrth_Vallis_Color_Mosaic.wms
index 5101daebe1..e5f8b14572 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Mawrth_Vallis_Color_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Mawrth_Vallis_Color_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Mawrth_Vallis_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Mawrth_Vallis_Mosaic.wms
index 14705bb879..d03d32be17 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Mawrth_Vallis_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Mawrth_Vallis_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Viking_1_Landing_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Viking_1_Landing_Site_Mosaic.wms
index 1215c0ca7c..1698a833ba 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Viking_1_Landing_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Viking_1_Landing_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Viking_2_Landing_Site_Mosaic.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Viking_2_Landing_Site_Mosaic.wms
index 956e3f5d09..01819ffee5 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Viking_2_Landing_Site_Mosaic.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Express_HRSC/Viking_2_Landing_Site_Mosaic.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
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 56fdc9e4c1..8a13ebcd68 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
@@ -10,9 +10,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -24,9 +24,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -38,9 +38,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -52,9 +52,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -66,9 +66,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -80,9 +80,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -94,9 +94,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -108,9 +108,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -122,9 +122,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -136,9 +136,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -150,9 +150,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -164,9 +164,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -178,9 +178,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -192,9 +192,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -206,9 +206,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -220,9 +220,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -234,9 +234,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -248,9 +248,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -262,9 +262,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -276,9 +276,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -290,9 +290,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -302,9 +302,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -314,9 +314,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -326,9 +326,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -338,9 +338,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -350,9 +350,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -362,9 +362,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -374,9 +374,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -386,9 +386,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -398,9 +398,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -410,9 +410,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -422,9 +422,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -434,9 +434,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -446,9 +446,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -458,9 +458,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -470,9 +470,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -482,9 +482,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -494,9 +494,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -506,9 +506,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -518,9 +518,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -530,9 +530,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -542,9 +542,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -554,9 +554,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -566,9 +566,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -578,9 +578,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -590,9 +590,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -602,9 +602,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -614,9 +614,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -626,9 +626,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -638,9 +638,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -650,9 +650,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -662,9 +662,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -674,9 +674,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -686,9 +686,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -698,9 +698,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -710,9 +710,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -722,9 +722,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -734,9 +734,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -746,9 +746,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -758,9 +758,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.]]
@@ -770,9 +770,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -784,9 +784,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
@@ -798,9 +798,9 @@ 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"),
-  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. 
+  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: 
+References:
 Shean, D. E., O. Alexandrov, Z. Moratto, B. E. Smith, I. R. Joughin, C. C. Porter, P. J., Morin, 2016, An automated, open-source pipeline for mass production of digital elevation models (DEMs) from very high-resolution commercial stereo satellite imagery, ISPRS Journal of Photogrammetry and Remote Sensing, 116.
 
 Mayer, D. P., E. S. Kite, 2016, An Integrated Workflow for Producing Digital Terrain Models Of Mars from CTX And HiRISE Stereo Data Using the NASA Ames Stereo Pipeline, 47th Lunar and Planetary Science Conference, Abstract 1261.
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_12S182E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_12S182E.wms
index fbcf130e29..1bfeb492bc 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_12S182E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_12S182E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_13S182E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_13S182E.wms
index d1eff04192..b82bff0163 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_13S182E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_13S182E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_14S184E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_14S184E.wms
index aceaf1b5d0..6844f87531 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_14S184E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Apollinaris_14S184E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_10S291E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_10S291E.wms
index b338ae20f3..123de8aa32 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_10S291E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_10S291E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_11S293E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_11S293E.wms
index bfedd22f5c..fa0f46bb44 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_11S293E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_11S293E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_13S293E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_13S293E.wms
index 5bc6ddd4b2..f1051d55e4 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_13S293E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Coprates_13S293E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_37N024E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_37N024E.wms
index 2a09c2be18..7e0cc2485b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_37N024E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_37N024E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_38N024E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_38N024E.wms
index e37c6dc7fe..35c74c0250 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_38N024E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_38N024E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_39N024E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_39N024E.wms
index d058b1453c..b3aec48c5d 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_39N024E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_39N024E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_40N024E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_40N024E.wms
index 9e7b8fc58b..1c5bad2013 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_40N024E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_Deuteronius_40N024E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S289E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S289E.wms
index bb05888291..7aeec77cfa 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S289E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S289E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S291E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S291E.wms
index 30d8ea939c..3eb0dbe6c1 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S291E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_11S291E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_D01.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_D01.wms
index a5df0155b8..a5ee9d1629 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_D01.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_D01.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_F18.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_F18.wms
index 9c9fc8d626..e599dfbb24 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_F18.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S289E_F18.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S290E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S290E.wms
index c82395cdb2..28fd660b24 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S290E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S290E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F14.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F14.wms
index e4799ddeed..f2288dddf4 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F14.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F14.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F21.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F21.wms
index b227a15859..4a91f0335b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F21.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_F21.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_J01.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_J01.wms
index d64b4fd9f8..1b407e8149 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_J01.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_12S291E_J01.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_13S289E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_13S289E.wms
index 21a7a2e227..726deac724 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_13S289E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_13S289E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_16S291E_D22.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_16S291E_D22.wms
index c9400c5d57..a374058afa 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_16S291E_D22.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Color_Slope_East_Melas_16S291E_D22.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_12S182E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_12S182E.wms
index b3db834052..aca9d85312 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_12S182E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_12S182E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_13S182E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_13S182E.wms
index 93cc7b0f8a..a0300a68fc 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_13S182E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_13S182E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_14S184E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_14S184E.wms
index 094842bb50..ef5c4de1d6 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_14S184E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Apollinaris_14S184E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_10S291E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_10S291E.wms
index 81a831fe5c..82e99e14aa 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_10S291E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_10S291E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_11S293E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_11S293E.wms
index c2da8d4cf7..1769afe651 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_11S293E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_11S293E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_13S293E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_13S293E.wms
index 5c51277f71..5af313df5a 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_13S293E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Coprates_13S293E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_37N024E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_37N024E.wms
index 9a774731a4..141448a056 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_37N024E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_37N024E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_38N024E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_38N024E.wms
index dd5ad16226..5fb1fa1ec2 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_38N024E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_38N024E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_39N024E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_39N024E.wms
index 8dc2f24e23..a846678276 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_39N024E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_39N024E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_40N024E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_40N024E.wms
index 135320d3b4..40c7091609 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_40N024E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_Deuteronius_40N024E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S289E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S289E.wms
index 0a967e4019..c5e20c7866 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S289E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S289E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S291E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S291E.wms
index 32325d7b46..44fe2a9adc 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S291E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_11S291E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_D01.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_D01.wms
index 9d5946bbe5..1cf3d008cb 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_D01.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_D01.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_F18.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_F18.wms
index 7c0f9a479e..d70dc5775f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_F18.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S289E_F18.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S290E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S290E.wms
index 9ecfd0a471..47405a7a32 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S290E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S290E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F14.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F14.wms
index a2ca3a6c40..d1064e4ab8 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F14.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F14.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F21.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F21.wms
index e6e992b846..156635ef95 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F21.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_F21.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_J01.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_J01.wms
index 2eab73a7cc..9d18b2989b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_J01.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_12S291E_J01.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_13S289E_D10.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_13S289E_D10.wms
index 66d6f986b7..19f2375cb2 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_13S289E_D10.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_13S289E_D10.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_16S291E_D22.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_16S291E_D22.wms
index 98f60e0be0..a33c03b744 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_16S291E_D22.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/HillShade_East_Melas_16S291E_D22.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Hilllshade_Deuteronilus.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Hilllshade_Deuteronilus.wms
index b062a7fdd2..a15646e9d9 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Hilllshade_Deuteronilus.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Hilllshade_Deuteronilus.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_12S182E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_12S182E.wms
index 9995dbf72e..af7a2107e3 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_12S182E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_12S182E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_13S182E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_13S182E.wms
index 7e3b9f58ab..ef174ecf37 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_13S182E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_13S182E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_14S184E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_14S184E.wms
index 419b188389..cd050e70f2 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_14S184E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Apollinaris_14S184E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_10S291E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_10S291E.wms
index 4bedc165e1..ee41eb7541 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_10S291E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_10S291E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_11S293E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_11S293E.wms
index 9a7a115476..a3fa4166f4 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_11S293E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_11S293E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_13S293E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_13S293E.wms
index aaf8a4cb33..cac9b68fff 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_13S293E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Coprates_13S293E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_38N024E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_38N024E.wms
index f16b62a6b2..d407ade553 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_38N024E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_38N024E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_39N024E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_39N024E.wms
index 8cb337d882..f2a9ba2417 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_39N024E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_39N024E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_40N024E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_40N024E.wms
index b0d9fd5e9c..978ec53771 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_40N024E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_Deuteronius_40N024E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S289E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S289E.wms
index d3c1da61b7..293e28d0e8 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S289E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S289E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S291E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S291E.wms
index 6f12b8cf80..0efb4b514b 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S291E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_11S291E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_D01.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_D01.wms
index 767d84ea24..e47d5c3537 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_D01.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_D01.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_F18.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_F18.wms
index 0588a12a4b..1260007b57 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_F18.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S289E_F18.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S290E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S290E.wms
index c7f9b32aae..eb02b7adf0 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S290E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S290E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F14.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F14.wms
index 68110ac4e4..5461d9eab2 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F14.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F14.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F21.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F21.wms
index 826b5f1cf2..4ecbafaed5 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F21.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_F21.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_J01.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_J01.wms
index 8757cfef21..5d335c7272 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_J01.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_12S291E_J01.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_13S289E_D10.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_13S289E_D10.wms
index 61d51750c1..c7e76d658f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_13S289E_D10.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_13S289E_D10.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_16S291E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_16S291E.wms
index 8dc1fe9110..c5f092fd09 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_16S291E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Mosaic_East_Melas_16S291E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_12S182E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_12S182E.wms
index b98d895d7b..5063219f53 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_12S182E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_12S182E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_13S182E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_13S182E.wms
index 6054db86ce..c105889948 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_13S182E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_13S182E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_14S184E.wms b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_14S184E.wms
index 45eaaf42da..9b90e9f34f 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_14S184E.wms
+++ b/data/assets/scene/solarsystem/planets/mars/layers/nasa-treks/Mars_Reconnaissance_Orbiter_CTX/Slope_Apollinaris_14S184E.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
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 b8e573261f..af77f07a94 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
@@ -31,7 +31,7 @@ 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. 
+  Description = [[Mercury MESSENGER MDIS Global Basemap BDR 166m layer for Mercury globe.
     This map is hosted on the OpenSpace server in Sweden]],
   Author = "USGS",
   URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_Basemap_BDR_Mosaic_Global_166m",
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 f4e66b1193..240619bfef 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
@@ -31,7 +31,7 @@ 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. 
+  Description = [[Mercury MESSENGER MDIS Global Basemap BDR 166m layer for Mercury globe.
     This map is hosted on the OpenSpace server in Utah]],
   Author = "USGS",
   URL = "https://astrogeology.usgs.gov/search/map/Mercury/Messenger/Global/Mercury_MESSENGER_MDIS_Basemap_BDR_Mosaic_Global_166m",
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 4bd91d0fbc..bd5a377fd8 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
@@ -9,7 +9,7 @@ local layer = {
     Gamma = 1.59,
     Multiplier = 1.38
   },
-  TilePixelSize = 64
+  TilePixelSize = 360
 }
 
 asset.onInitialize(function ()
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 f294501cbc..b45e33a0cc 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,21 +10,21 @@ 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"),
-  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).]]
+  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"),
-  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.]]
+  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"),
-  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).]]
+  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()
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/ColorHillshade_Global.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/ColorHillshade_Global.wms
index 2fdf4aee4b..c65121455c 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/ColorHillshade_Global.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/ColorHillshade_Global.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/Hillshade_Global.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/Hillshade_Global.wms
index 6ab604bd5f..7d4bffbf52 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/Hillshade_Global.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/Hillshade_Global.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/Slope_Colorized_Global.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/Slope_Colorized_Global.wms
index 1129459fed..350dba5c81 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/Slope_Colorized_Global.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS/Slope_Colorized_Global.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>400</ZeroBlockHttpCodes>
   </GDAL_WMS>
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 57f026c548..36c95e6edb 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,70 +10,70 @@ 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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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()
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Aksakov_Crater_Peak_Ring.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Aksakov_Crater_Peak_Ring.wms
index 90658f5d8f..1a61665ac1 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Aksakov_Crater_Peak_Ring.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Aksakov_Crater_Peak_Ring.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Crater_near_Dali_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Crater_near_Dali_Crater.wms
index c805ba2a32..e817dedd66 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Crater_near_Dali_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Crater_near_Dali_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Crater_near_Geddes_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Crater_near_Geddes_Crater.wms
index 39ac6ed11e..6ca256886e 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Crater_near_Geddes_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Crater_near_Geddes_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Degas_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Degas_Crater.wms
index 92a23811cb..29cfbf5cb6 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Degas_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Degas_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Kertesz_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Kertesz_Crater.wms
index f96e47c51e..917bd1ba21 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Kertesz_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Kertesz_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/North-West_of_Degas_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/North-West_of_Degas_Crater.wms
index 908c7d078b..b26a81e92b 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/North-West_of_Degas_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/North-West_of_Degas_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Praxiteles_Peak_Ring.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Praxiteles_Peak_Ring.wms
index 92d3f5f2ef..fdd7c8803c 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Praxiteles_Peak_Ring.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Praxiteles_Peak_Ring.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Raditladi_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Raditladi_Crater.wms
index ceadecf8c4..d7b2d6b63c 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Raditladi_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Raditladi_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Sander_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Sander_Crater.wms
index 9c1778f011..a705bab0fe 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Sander_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Sander_Crater.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Sholem_Aleichem_Crater_Wall.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Sholem_Aleichem_Crater_Wall.wms
index 4444ac2b52..d1917abe06 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Sholem_Aleichem_Crater_Wall.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Mosaic/Sholem_Aleichem_Crater_Wall.wms
@@ -20,5 +20,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
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 d8c1e77abe..a86bf3230a 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,70 +10,70 @@ 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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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"),
-  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.]]
+  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()
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Aksakov_Crater_Peak_Ring.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Aksakov_Crater_Peak_Ring.wms
index 893397fc3d..bf5393cd30 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Aksakov_Crater_Peak_Ring.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Aksakov_Crater_Peak_Ring.wms
@@ -27,5 +27,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Crater_near_Dali_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Crater_near_Dali_Crater.wms
index 81ccecf687..fe0fe49bf3 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Crater_near_Dali_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Crater_near_Dali_Crater.wms
@@ -27,5 +27,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Crater_near_Geddes_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Crater_near_Geddes_Crater.wms
index e9bc75ac5b..6d59f7d2ca 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Crater_near_Geddes_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Crater_near_Geddes_Crater.wms
@@ -27,5 +27,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Degas_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Degas_Crater.wms
index fddbacc2fb..d58baf98bf 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Degas_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Degas_Crater.wms
@@ -27,5 +27,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Kertesz_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Kertesz_Crater.wms
index e9e3ee1101..8b9b65646a 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Kertesz_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Kertesz_Crater.wms
@@ -27,5 +27,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/North-West_of_Degas_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/North-West_of_Degas_Crater.wms
index 8791152c14..fb60f86d3a 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/North-West_of_Degas_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/North-West_of_Degas_Crater.wms
@@ -27,5 +27,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Praxiteles_Peak_Ring.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Praxiteles_Peak_Ring.wms
index a247bad651..8d4491ff73 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Praxiteles_Peak_Ring.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Praxiteles_Peak_Ring.wms
@@ -27,5 +27,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Raditladi_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Raditladi_Crater.wms
index 79e6f9290b..7069afd52c 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Raditladi_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Raditladi_Crater.wms
@@ -27,5 +27,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Sander_Crater.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Sander_Crater.wms
index bc51c5f56e..4a47ed2366 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Sander_Crater.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Sander_Crater.wms
@@ -27,5 +27,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Sholem_Aleichem_Crater_Wall.wms b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Sholem_Aleichem_Crater_Wall.wms
index 43dabcabe8..644b1970be 100644
--- a/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Sholem_Aleichem_Crater_Wall.wms
+++ b/data/assets/scene/solarsystem/planets/mercury/layers/nasa-treks/MSGR_MDIS_Slope/Sholem_Aleichem_Crater_Wall.wms
@@ -27,5 +27,5 @@
     <BandsCount>3</BandsCount>
     <MaxConnections>10</MaxConnections>
     <DataValues NoData="0" Min="1" Max="255"/>
-    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>    
+    <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
   </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
index 29372eb903..94c9ff4fa4 100644
--- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
@@ -1,9 +1,7 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("./transforms")
-local kernels = asset.require("./kernels")
-local kernel081 = kernels.nep081
-local kernel087 = kernels.nep087
-local kernel088 = kernels.nep088
+local kernel095 = asset.require("./kernels").nep095
+local kernel = asset.require("./kernels").nep097
 
 
 
@@ -35,7 +33,7 @@ local innerMoons = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.294,
-    Kernels = kernel088
+    Kernels = kernel095
   },
   {
     Identifier = "Thalassa",
@@ -52,7 +50,7 @@ local innerMoons = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.311,
-    Kernels = kernel088
+    Kernels = kernel095
   },
   {
     Identifier = "Despina",
@@ -69,7 +67,7 @@ local innerMoons = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.335,
-    Kernels = kernel088
+    Kernels = kernel095
   },
   {
     Identifier = "Galatea",
@@ -86,7 +84,7 @@ local innerMoons = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.429,
-    Kernels = kernel088
+    Kernels = kernel095
   },
   {
     Identifier = "Larissa",
@@ -103,10 +101,10 @@ local innerMoons = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.555,
-    Kernels = kernel088
+    Kernels = kernel095
   },
   {
-    Identifier = "S2004N1",
+    Identifier = "Hippocamp",
     Parent = {
       Identifier = parentIdentifier,
       Spice = parentSpice
@@ -116,12 +114,12 @@ local innerMoons = {
     Tags = tags,
     TrailTags = trailTags,
     GUI = {
-      Name = "S/2004 N 1",
+      Name = "Hippocamp",
       Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.936,
-    Kernels = kernel088
+    Kernels = kernel
   },
   {
     Identifier = "Proteus",
@@ -138,7 +136,7 @@ local innerMoons = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.122,
-    Kernels = kernel081
+    Kernels = kernel095
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
similarity index 79%
rename from data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset
rename to data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
index 4677234303..98b4946e71 100644
--- a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/irregular_moons.asset
@@ -1,9 +1,6 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("./transforms")
-local kernels = asset.require("./kernels")
-local kernel081 = kernels.nep081
-local kernel086 = kernels.nep086
-local kernel088 = kernels.nep088
+local kernel = asset.require("./kernels").nep102
 
 
 
@@ -35,7 +32,7 @@ local irregularProgradeMoons = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1879.08,
-    Kernels = kernel086
+    Kernels = kernel
   },
   {
     Identifier = "Psamathe",
@@ -52,7 +49,41 @@ local irregularProgradeMoons = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 9074.3,
-    Kernels = kernel086
+    Kernels = kernel
+  },
+  {
+    Identifier = "Sao",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "SAO",
+    Radii = { 44000, 44000, 44000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 2912.72,
+    Kernels = kernel
+  },
+  {
+    Identifier = "Laomedeia",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "LAOMEDEIA",
+    Radii = { 42000, 42000, 42000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 3171.33,
+    Kernels = kernel
   },
   {
     Identifier = "Neso",
@@ -69,7 +100,7 @@ local irregularProgradeMoons = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 9740.73,
-    Kernels = kernel086
+    Kernels = kernel
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset
deleted file mode 100644
index ff8e2102c1..0000000000
--- a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset
+++ /dev/null
@@ -1,143 +0,0 @@
-local proceduralGlobes = asset.require("util/procedural_globe")
-local transforms = asset.require("./transforms")
-local kernels = asset.require("./kernels")
-local kernel081 = kernels.nep081
-local kernel086 = kernels.nep086
-
-
-
-local parentIdentifier = transforms.NeptuneBarycenter.Identifier
-local parentSpice = "NEPTUNE BARYCENTER"
-local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_irregular_retrograde", "moon_minor", "moon_minor_neptune" }
-local trailColor = { 0.2, 0.5, 0.75 }
-local trailTags = {
-  "moonTrail_solarSystem",
-  "moonTrail_giants",
-  "moonTrail_neptune",
-  "moonTrail_minor",
-  "moonTrail_minor_neptune"
-}
-
-local irregularRetrogradeMoons = {
-  {
-    Identifier = "Nereid",
-    Parent = {
-      Identifier = parentIdentifier,
-      Spice = parentSpice
-    },
-    Spice = "NEREID",
-    Radii = { 340000, 340000, 340000 },
-    Tags = tags,
-    TrailTags = trailTags,
-    GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons"
-    },
-    TrailColor = trailColor,
-    OrbitPeriod = 360.13,
-    Kernels = kernel081
-  },
-  {
-    Identifier = "Sao",
-    Parent = {
-      Identifier = parentIdentifier,
-      Spice = parentSpice
-    },
-    Spice = "SAO",
-    Radii = { 44000, 44000, 44000 },
-    Tags = tags,
-    TrailTags = trailTags,
-    GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons"
-    },
-    TrailColor = trailColor,
-    OrbitPeriod = 2912.72,
-    Kernels = kernel086
-  },
-  {
-    Identifier = "Laomedeia",
-    Parent = {
-      Identifier = parentIdentifier,
-      Spice = parentSpice
-    },
-    Spice = "LAOMEDEIA",
-    Radii = { 42000, 42000, 42000 },
-    Tags = tags,
-    TrailTags = trailTags,
-    GUI = {
-      Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons"
-    },
-    TrailColor = trailColor,
-    OrbitPeriod = 3171.33,
-    Kernels = kernel086
-  }
-}
-
-
--- Generate labels for each moon
-local moon_labels = {}
-
-for i, moon in ipairs(irregularRetrogradeMoons) do
-  local moonName = moon.GUI.Name or moon.Identifier
-  moon_labels[i] = {
-    Identifier = moon.Identifier .. "Label",
-    Parent = moon.Identifier,
-    Renderable = {
-      Enabled = false,
-      Type = "RenderableLabel",
-      Text = moonName,
-      FontSize = 70.0,
-      Size = 7.4,
-      MinMaxSize = { 1, 25 },
-      OrientationOption = "Camera View Direction",
-      BlendMode = "Additive",
-      EnableFading = true,
-      FadeUnit = "Gm",
-      FadeDistances = { 1, 250.0 },
-      FadeWidths = { 1, 250.0 },
-    },
-    Tag = { "solarsystem_labels", "moon_labels", "minor_moon_labels" },
-    GUI = {
-      Name = moonName .. " Label",
-      Path = "/Solar System/Planets/Neptune/Moons",
-      Description = "Label for Neptune's moon " .. moonName .. " (Irregular retrograde group)"
-    }
-  }
-end
-
-local nodes = proceduralGlobes.createGlobes(irregularRetrogradeMoons)
-
-asset.onInitialize(function()
-  for _, node in ipairs(nodes) do
-    openspace.addSceneGraphNode(node)
-  end
-
-  for _, moonlabel in ipairs(moon_labels) do
-    openspace.addSceneGraphNode(moonlabel)
-  end
-end)
-
-asset.onDeinitialize(function()
-  for i = #moon_labels, 1, -1 do
-    openspace.removeSceneGraphNode(moon_labels[i])
-  end
-
-  for i = #nodes, 1, -1 do
-    openspace.removeSceneGraphNode(nodes[i])
-  end
-end)
-
-for _, node in ipairs(nodes) do
-  asset.export(node)
-end
-
-
-asset.meta = {
-  Name = "Neptune Irregular Retrograde Moons",
-  Version = "1.0",
-  Description = [[Procedural Globe asset containing Neptune' irregular retrograde
-    moons: Nereid, Sao and Laomedeia. 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/neptune/kernels.asset b/data/assets/scene/solarsystem/planets/neptune/kernels.asset
index 1511116f76..3343a941e3 100644
--- a/data/assets/scene/solarsystem/planets/neptune/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/kernels.asset
@@ -2,13 +2,13 @@ local Kernels = asset.syncedResource({
   Name = "Neptune Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "neptune_kernels",
-  Version = 1
+  Version = 2
 })
 
-asset.export("nep081", Kernels .. "nep081.bsp")
-asset.export("nep086", Kernels .. "nep086.bsp")
-asset.export("nep087", Kernels .. "nep087.bsp")
-asset.export("nep088", Kernels .. "nep088.bsp")
+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")
 
 
 asset.meta = {
diff --git a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
index b3ad035361..2d5ad03546 100644
--- a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset
@@ -1,4 +1,5 @@
-asset.require("./triton")
+asset.require("./triton/triton")
+asset.require("./nereid/nereid")
 
 
 asset.meta = {
diff --git a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
index 9bc23449ea..19a16e02d2 100644
--- a/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/minor_moons.asset
@@ -1,10 +1,9 @@
 asset.require("./inner_moons")
-asset.require("./irregular_prograde_moons")
-asset.require("./irregular_retrograde_moons")
+asset.require("./irregular_moons")
 
 local minormoons_on = {
   Identifier = "os.solarsystem.neptune.minormoonson",
-  Name = "Turn ON minor moons and trails",
+  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');
@@ -12,14 +11,14 @@ local minormoons_on = {
     local moons = openspace.getProperty('{moon_minor_neptune}.Renderable.Enabled');
     local moons_fade = openspace.getProperty('{moon_minor_neptune}.Renderable.Fade');
 
-    for i, v in pairs(trails_fade) do 
+    for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
-      openspace.setPropertyValueSingle(v, 1, 2, 'Linear') 
+      openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
     end
 
-    for i, v in pairs(moons_fade) do 
+    for i, v in pairs(moons_fade) do
       openspace.setPropertyValueSingle(moons[i], true)
-      openspace.setPropertyValueSingle(v, 1, 2, 'Linear') 
+      openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
     end
   ]],
   Documentation = "Turn ON Neptune's minor moons and their trails",
@@ -29,7 +28,7 @@ local minormoons_on = {
 
 local minormoons_off = {
   Identifier = "os.solarsystem.neptune.minormoonsoff",
-  Name = "Turn OFF minors moon and trails",
+  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');
@@ -37,12 +36,12 @@ local minormoons_off = {
     local moons = openspace.getProperty('{moon_minor_neptune}.Renderable.Enabled');
     local moons_fade = openspace.getProperty('{moon_minor_neptune}.Renderable.Fade');
 
-    for i, v in pairs(trails_fade) do 
-      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" ) 
+    for i, v in pairs(trails_fade) do
+      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" )
     end
 
     for i, v in pairs(moons_fade) do
-      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" ) 
+      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" )
     end
   ]],
   Documentation = "Turn OFF Neptune's minor moons and their trails",
@@ -63,8 +62,8 @@ end)
 asset.meta = {
   Name = "Neptune Minor Moons",
   Version = "1.1",
-  Description = [[Meta asset containing 3 moon groups: inner_moons,
-    irregular_prograde_moons, and irregular_retrograde_moons]],
+  Description = [[Meta asset containing two moon groups: inner_moons and 
+    irregular_moons]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
index 917cbe7439..e9b6152538 100644
--- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
@@ -1,6 +1,7 @@
 local transforms = asset.require("./transforms")
 asset.require("spice/base")
 asset.require("./trail")
+local kernel = asset.require("./kernels").nep097
 
 local Neptune = {
   Identifier = "Neptune",
@@ -9,7 +10,8 @@ local Neptune = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "NEPTUNE",
-      Observer = "NEPTUNE BARYCENTER"
+      Observer = "NEPTUNE BARYCENTER",
+      Kernels = kernel
     },
     Rotation = {
       Type = "SpiceRotation",
diff --git a/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
new file mode 100644
index 0000000000..21be217580
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/neptune/nereid/nereid.asset
@@ -0,0 +1,93 @@
+local proceduralGlobes = asset.require("util/procedural_globe")
+local transforms = asset.require("../transforms")
+local kernel = asset.require("../kernels").nep101xl_802
+
+
+local Nereid = {
+  Identifier = "Nereid",
+  Parent = {
+    Identifier = transforms.NeptuneBarycenter.Identifier,
+    Spice = "NEPTUNE BARYCENTER"
+  },
+  Spice = "NEREID",
+  Radii = { 357000, 340000, 340000 },
+  Tags = { "moon_solarSystem", "moon_giants", "moon_neptune" },
+  TrailTags = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune" },
+  GUI = {
+    Path = "/Solar System/Planets/Neptune/Moons"
+  },
+  TrailColor = { 0.2, 0.5, 0.75 },
+  OrbitPeriod = 360.13,
+  Kernels = kernel
+}
+
+
+-- Generate labels for each moon
+local moon_labels = {}
+
+for i, moon in ipairs({ Nereid }) do
+  local moonName = moon.GUI.Name or moon.Identifier
+  moon_labels[i] = {
+    Identifier = moon.Identifier .. "Label",
+    Parent = moon.Identifier,
+    Renderable = {
+      Enabled = false,
+      Type = "RenderableLabel",
+      Text = moonName,
+      FontSize = 50.0,
+      Size = 7.0,
+      MinMaxSize = { 1, 25 },
+      OrientationOption = "Camera View Direction",
+      BlendMode = "Additive",
+      EnableFading = true,
+      FadeUnit = "Gm",
+      FadeDistances = { 1, 15.0 },
+      FadeWidths = { 1, 15.0 },
+    },
+    Tag = { "solarsystem_labels", "moon_labels", "major_moon_labels" },
+    GUI = {
+      Name = moonName .. " Label",
+      Path = "/Solar System/Planets/Neptune/Moons",
+      Description = "Label for Neptune's moon " .. moonName
+    }
+  }
+end
+
+
+local nodes = proceduralGlobes.createGlobes({ Nereid })
+
+asset.onInitialize(function()
+  for _, node in ipairs(nodes) do
+    openspace.addSceneGraphNode(node)
+  end
+
+  for _, moonlabel in ipairs(moon_labels) do
+    openspace.addSceneGraphNode(moonlabel)
+  end
+end)
+
+asset.onDeinitialize(function()
+  for i = #moon_labels, 1, -1 do
+    openspace.removeSceneGraphNode(moon_labels[i])
+  end
+
+  for i = #nodes, 1, -1 do
+    openspace.removeSceneGraphNode(nodes[i])
+  end
+end)
+
+for _, node in ipairs(nodes) do
+  asset.export(node)
+end
+
+
+
+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",
+  URL = "http://openspaceproject.com",
+  License = "MIT license"
+}
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset
index 4af5ba2cd4..dda68425c0 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 asset.require("spice/base")
+local kernel = asset.require("./kernels").nep097
 
 
 
@@ -11,7 +12,8 @@ local NeptuneTrail = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "NEPTUNE",
-      Observer = "SSB"
+      Observer = "SSB",
+      Kernels = kernel
     },
     Color = { 0.2, 0.5, 1.0 },
     -- Period  = 60200,
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset b/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
index 112c4a71ed..ae92975815 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail_barycenter.asset
@@ -1,5 +1,6 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 asset.require("spice/base")
+local kernel = asset.require("./kernels").nep097
 
 
 
@@ -11,7 +12,8 @@ local NeptuneBarycenterTrail = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "NEPTUNE BARYCENTER",
-      Observer = "SSB"
+      Observer = "SSB",
+      Kernels = kernel
     },
     Color = { 0.2, 0.5, 1.0 },
     Period  = 60266,
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
index b79ed5ac5c..8ea0b55222 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset
@@ -1,6 +1,7 @@
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
 asset.require("spice/base")
+local kernel = asset.require("./kernels").nep097
 
 
 
@@ -12,7 +13,8 @@ local NeptuneTrailEarth = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "NEPTUNE",
-      Observer = "EARTH"
+      Observer = "EARTH",
+      Kernels = kernel
     },
     Color = { 1.0, 0.5, 0.2 },
     Period = 224.695,
diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset
index a4c81387b8..903a55f4f6 100644
--- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset
@@ -1,5 +1,6 @@
 local sun_transforms_asset = asset.require("scene/solarsystem/sun/transforms")
 asset.require("spice/base")
+local kernel = asset.require("./kernels").nep097
 
 local NeptuneBarycenter = {
   Identifier = "NeptuneBarycenter",
@@ -8,7 +9,8 @@ local NeptuneBarycenter = {
     Translation = {
       Type = "SpiceTranslation",
       Target = "NEPTUNE BARYCENTER",
-      Observer = "SSB"
+      Observer = "SSB",
+      Kernels = kernel
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
similarity index 92%
rename from data/assets/scene/solarsystem/planets/neptune/triton.asset
rename to data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
index 0f63edb6c8..ebbc644a2e 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton/triton.asset
@@ -1,6 +1,6 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
-local transforms = asset.require("./transforms")
-local kernel = asset.require("./kernels").nep081
+local transforms = asset.require("../transforms")
+local kernel = asset.require("../kernels").nep097
 
 
 
@@ -15,7 +15,7 @@ local Triton = {
   Tags = { "moon_solarSystem", "moon_giants", "moon_neptune" },
   TrailTags = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_neptune" },
   GUI = {
-    Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+    Path = "/Solar System/Planets/Neptune/Moons"
   },
   TrailColor = { 0.2, 0.5, 0.75 },
   OrbitPeriod = 5.877,
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
index 5a2baed2ee..447aca79ec 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 asset.require("./trail")
 
 local labelsPath = asset.syncedResource({
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
index 0bd7895e15..076bfe9ea7 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
index 4035fe53f5..dda8760dd0 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 asset.require("./trail")
 
 local labelsPath = asset.syncedResource({
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
index 8918169f3b..408ef6914b 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
index 9df51d793f..72d6f82cbf 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 asset.require("./trail")
 
 local labelsPath = asset.syncedResource({
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
index 09f870b4f7..4bc21d9acd 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
index a841b2e21f..3c57ea8c92 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 asset.require("./trail")
 
 local labelsPath = asset.syncedResource({
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
index b9b3371148..db55d9ba5d 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/kernels.asset b/data/assets/scene/solarsystem/planets/saturn/kernels.asset
index e6f3176e7b..c52a03bd21 100644
--- a/data/assets/scene/solarsystem/planets/saturn/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/kernels.asset
@@ -2,13 +2,12 @@ local Kernels = asset.syncedResource({
   Name = "Saturn Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "saturn_kernels",
-  Version = 1
+  Version = 2
 })
 
-asset.export("sat319", Kernels .. "sat319.bsp")
-asset.export("sat368", Kernels .. "sat368.bsp")
-asset.export("sat375", Kernels .. "sat375.bsp")
-asset.export("sat393", Kernels .. "sat393.bsp")
+asset.export("sat415", Kernels .. "sat415.bsp")
+asset.export("sat441", Kernels .. "sat441.bsp")
+asset.export("sat452", Kernels .. "sat452.bsp")
 
 
 asset.meta = {
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
index 1c63b5c0ef..e806aed9c1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 asset.require("./trail")
 
 local labelsPath = asset.syncedResource({
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
index 16326c78b1..20fb844653 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 
 
 
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 7b2f72efdb..f82db16368 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
@@ -1,6 +1,6 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat368
+local kernel = asset.require("../kernels").sat452
 
 
 
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 6642e7850f..2ee155c0fe 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
@@ -1,6 +1,6 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat368
+local kernel = asset.require("../kernels").sat452
 
 
 
@@ -101,6 +101,60 @@ local inuitGroup = {
     TrailColor = trailColor,
     OrbitPeriod = 894.86,
     Kernels = kernel
+  },
+  {
+    Identifier = "S2004S29",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "660",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2004 S 29",
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 858.77,
+    Kernels = kernel
+  },
+  {
+    Identifier = "S2004S31",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "65067",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2004 S 31",
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 853.80,
+    Kernels = kernel
+  },
+  {
+    Identifier = "S2019S01",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "65093",
+    Radii = { 5000, 5000, 5000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2019 S 01",
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 443.78,
+    Kernels = kernel
   }
 }
 
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 0a1efada10..1400306681 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
@@ -1,8 +1,8 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
 local kernels = asset.require("../kernels")
-local kernel368 = kernels.sat368
-local kernel375 = kernels.sat375
+local kernel441 = kernels.sat441
+local kernel452 = kernels.sat452
 
 
 
@@ -34,7 +34,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 545.09,
-    Kernels = kernel375
+    Kernels = kernel441
   },
   {
     Identifier = "Skathi",
@@ -51,7 +51,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 732.52,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "S2007S2",
@@ -59,7 +59,7 @@ local norseGroup = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "65055",
+    Spice = "65091",
     Radii = { 6000, 6000, 6000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -69,7 +69,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 792.96,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Skoll",
@@ -86,7 +86,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 862.37,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "S2004S13",
@@ -94,7 +94,7 @@ local norseGroup = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "65041",
+    Spice = "65087",
     Radii = { 6000, 6000, 6000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -104,7 +104,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 905.85,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Greip",
@@ -121,7 +121,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 906.56,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Hyrrokkin",
@@ -138,7 +138,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 914.29,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Jarnsaxa",
@@ -155,7 +155,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 943.78,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Mundilfari",
@@ -172,7 +172,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 956.70,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "S2006S1",
@@ -180,7 +180,7 @@ local norseGroup = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "65048",
+    Spice = "65089",
     Radii = { 6000, 6000, 6000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -190,7 +190,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 972.41,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "S2004S17",
@@ -198,7 +198,7 @@ local norseGroup = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "65045",
+    Spice = "65088",
     Radii = { 4000, 4000, 4000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -208,7 +208,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 985.45,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Bergelmir",
@@ -225,7 +225,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 985.83,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Narvi",
@@ -242,7 +242,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1008.45,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Suttungr",
@@ -259,7 +259,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1022.82,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Hati",
@@ -276,7 +276,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1033.05,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "S2004S12",
@@ -284,7 +284,7 @@ local norseGroup = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "65040",
+    Spice = "65086",
     Radii = { 5000, 5000, 5000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -294,7 +294,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1048.54,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Farbauti",
@@ -311,7 +311,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1054.78,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Thrymr",
@@ -328,7 +328,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1078.09,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Aegir",
@@ -345,7 +345,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1094.46,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "S2007S3",
@@ -353,7 +353,7 @@ local norseGroup = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "65056",
+    Spice = "65092",
     Radii = { 5000, 5000, 5000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -363,7 +363,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1100,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Bestla",
@@ -380,7 +380,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1101.45,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "S2004S7",
@@ -388,7 +388,7 @@ local norseGroup = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "65035",
+    Spice = "65085",
     Radii = { 6000, 6000, 6000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -398,7 +398,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1101.99,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "S2006S3",
@@ -406,7 +406,7 @@ local norseGroup = {
       Identifier = parentIdentifier,
       Spice = parentSpice
     },
-    Spice = "65050",
+    Spice = "65090",
     Radii = { 6000, 6000, 6000 },
     Tags = tags,
     TrailTags = trailTags,
@@ -416,7 +416,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1142.37,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "FENRIR",
@@ -433,25 +433,24 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1212.53,
-    Kernels = kernel368
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Surtur", -- Rising
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "648",
+    Radii = { 6000, 6000, 6000 },
+    Tags = tags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1297.7,
+    Kernels = kernel452
   },
-  -- Not yet in the Spice kernels
-  -- {
-  --   Identifier = "Sutur", -- Rising
-  --   Parent = {
-  --     Identifier = parentIdentifier,
-  --     Spice = parentSpice
-  --   },
-  --   Spice = "SUTUR",
-  --   Radii = { 6000, 6000, 6000 },
-  --   Tags = tags,
-  --   GUI = {
-  --     Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
-  --   },
-  --   TrailColor = trailColor,
-  --   OrbitPeriod = 1242.36,
-  --   Kernels = kernels368
-  -- },
   {
     Identifier = "Kari",
     Parent = {
@@ -467,7 +466,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1245.06,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Ymir",
@@ -484,7 +483,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1254.15,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Loge",
@@ -501,7 +500,7 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1300.95,
-    Kernels = kernel368
+    Kernels = kernel452
   },
   {
     Identifier = "Fornjot",
@@ -518,7 +517,320 @@ local norseGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1432.16,
-    Kernels = kernel368
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Skadi",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "627",
+    Radii = { 8000, 8000, 8000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 728.2,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Gridr",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "654",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 990.23,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Angrboda",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "655",
+    Radii = { 3000, 3000, 3000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1080.4,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Skrymir",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "656",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1164.3,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Gerd",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "657",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1095.0,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "S2004S26",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "658",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2004 S 26",
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1624.2,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Eggther",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "659",
+    Radii = { 6000, 6000, 6000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1033.0,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Beli",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "661",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1084.1,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Gunnlod",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "662",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1175.3,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Thiazzi",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "663",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1361.5,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "S2004S34",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "664",
+    Radii = { 3000, 3000, 3000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2004 S 34",
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1412.5,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Alvaldi",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "665",
+    Radii = { 5000, 5000, 5000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1208.1,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "Geirrod",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "666",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1295.8,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "S2004S28",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "65077",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2004 S 28",
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1197.2,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "S2004S21",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "65079",
+    Radii = { 3000, 3000, 3000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2004 S 21",
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1365.1,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "S2004S36",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "65081",
+    Radii = { 3000, 3000, 3000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2004 S 36",
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1354.2,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "S2004S37",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "65082",
+    Radii = { 4000, 4000, 4000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2004 S 37",
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 752.88,
+    Kernels = kernel452
+  },
+  {
+    Identifier = "S2004S39",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "65084",
+    Radii = { 3000, 3000, 3000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2004 S 39",
+      Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1277.5,
+    Kernels = kernel452
   }
 }
 
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 552104b632..af78ba6ad8 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
@@ -1,8 +1,9 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("../transforms")
 local kernels = asset.require("../kernels")
-local kernel375 = kernels.sat375
-local kernel393 = kernels.sat393
+local kernel415 = kernels.sat415
+local kernel441 = kernels.sat441
+local kernel452 = kernels.sat452
 
 
 
@@ -34,7 +35,7 @@ local otherGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 0.80812,
-    Kernels = kernel393
+    Kernels = kernel415
   },
   {
     Identifier = "Methone",
@@ -51,7 +52,7 @@ local otherGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.00957,
-    Kernels = kernel393
+    Kernels = kernel415
   },
   {
     Identifier = "Anthe",
@@ -68,7 +69,7 @@ local otherGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.05089,
-    Kernels = kernel393
+    Kernels = kernel415
   },
   {
     Identifier = "Pallene",
@@ -85,7 +86,7 @@ local otherGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.370218,
-    Kernels = kernel393
+    Kernels = kernel415
   },
   {
     Identifier = "Telesto",
@@ -102,7 +103,7 @@ local otherGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.887802,
-    Kernels = kernel375
+    Kernels = kernel441
   },
   {
     Identifier = "Calypso",
@@ -119,7 +120,7 @@ local otherGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 1.887802,
-    Kernels = kernel375
+    Kernels = kernel441
   },
   {
     Identifier = "Helene",
@@ -136,7 +137,7 @@ local otherGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 2.736915,
-    Kernels = kernel375
+    Kernels = kernel441
   },
   {
     Identifier = "Polydeuces",
@@ -153,7 +154,25 @@ local otherGroup = {
     },
     TrailColor = trailColor,
     OrbitPeriod = 2.736915,
-    Kernels = kernel393
+    Kernels = kernel441
+  },
+  {
+    Identifier = "S2004S24",
+    Parent = {
+      Identifier = parentIdentifier,
+      Spice = parentSpice
+    },
+    Spice = "65070",
+    Radii = { 3000, 3000, 3000 },
+    Tags = tags,
+    TrailTags = trailTags,
+    GUI = {
+      Name = "S/2004 S 24",
+      Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+    },
+    TrailColor = trailColor,
+    OrbitPeriod = 1293.85,
+    Kernels = kernel452
   }
 }
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
index cf98ce0f4f..9851b5d0d5 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset
@@ -6,7 +6,7 @@ asset.require("./minor/shepherd_group")
 
 local minormoons_on = {
   Identifier = "os.solarsystem.saturn.minormoonson",
-  Name = "Turn ON minor moons and trails",
+  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');
@@ -14,14 +14,14 @@ local minormoons_on = {
     local moons = openspace.getProperty('{moon_minor_saturn}.Renderable.Enabled');
     local moons_fade = openspace.getProperty('{moon_minor_saturn}.Renderable.Fade');
 
-    for i, v in pairs(trails_fade) do 
+    for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
-      openspace.setPropertyValueSingle(v, 1, 2, 'Linear') 
+      openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
     end
 
-    for i, v in pairs(moons_fade) do 
+    for i, v in pairs(moons_fade) do
       openspace.setPropertyValueSingle(moons[i], true)
-      openspace.setPropertyValueSingle(v, 1, 2, 'Linear') 
+      openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
     end
   ]],
   Documentation = "Turn ON Saturn's minor moons and their trails",
@@ -31,7 +31,7 @@ local minormoons_on = {
 
 local minormoons_off = {
   Identifier = "os.solarsystem.saturn.minormoonsoff",
-  Name = "Turn OFF minors moon and trails",
+  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');
@@ -39,12 +39,12 @@ local minormoons_off = {
     local moons = openspace.getProperty('{moon_minor_saturn}.Renderable.Enabled');
     local moons_fade = openspace.getProperty('{moon_minor_saturn}.Renderable.Fade');
 
-    for i, v in pairs(trails_fade) do 
-      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" ) 
+    for i, v in pairs(trails_fade) do
+      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" )
     end
 
     for i, v in pairs(moons_fade) do
-      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" ) 
+      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" )
     end
   ]],
   Documentation = "Turn OFF Saturn's minor moons and their trails",
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
index b1b441fa04..fed5a94335 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 asset.require("./trail")
 
 local labelsPath = asset.syncedResource({
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
index a985709375..3cdc35e70d 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
index 78f5825189..9e0a1faef7 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 asset.require("./trail")
 
 local labelsPath = asset.syncedResource({
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
index 7fa5e94717..e3829c1a53 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
index 6cddd13b22..3895ebe763 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 asset.require("./trail")
 
 local labelsPath = asset.syncedResource({
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
index 65384fbc8d..2c8699b07c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
@@ -1,5 +1,5 @@
 local transforms = asset.require("../transforms")
-local kernel = asset.require("../kernels").sat375
+local kernel = asset.require("../kernels").sat441
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
index c9cbabebe9..555acbede7 100644
--- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
@@ -1,6 +1,6 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("./transforms")
-local kernel = asset.require("./kernels").ura091
+local kernel = asset.require("./kernels").ura115
 
 
 
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 b82b0446b3..bb4a759054 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
@@ -1,6 +1,6 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("./transforms")
-local kernel = asset.require("./kernels").ura112
+local kernel = asset.require("./kernels").ura116
 
 
 
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 df1e401f53..2d09fd78f7 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
@@ -1,6 +1,6 @@
 local proceduralGlobes = asset.require("util/procedural_globe")
 local transforms = asset.require("./transforms")
-local kernel = asset.require("./kernels").ura112
+local kernel = asset.require("./kernels").ura116
 
 
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/kernels.asset b/data/assets/scene/solarsystem/planets/uranus/kernels.asset
index aaa96e06da..3585fd7832 100644
--- a/data/assets/scene/solarsystem/planets/uranus/kernels.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/kernels.asset
@@ -2,12 +2,12 @@ local Kernels = asset.syncedResource({
   Name = "Uranus Spice Kernels",
   Type = "HttpSynchronization",
   Identifier = "uranus_kernels",
-  Version = 1
+  Version = 2
 })
 
-asset.export("ura091", Kernels .. "ura091-rocks-merge.bsp")
 asset.export("ura111", Kernels .. "ura111.bsp")
-asset.export("ura112", Kernels .. "ura112.bsp")
+asset.export("ura115", Kernels .. "ura115.bsp")
+asset.export("ura116", Kernels .. "ura116.bsp")
 
 
 asset.meta = {
diff --git a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
index 3dda4bd61d..ac9834a7ee 100644
--- a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset
@@ -4,7 +4,7 @@ asset.require("./irregular_retrograde_moons")
 
 local minormoons_on = {
   Identifier = "os.solarsystem.uranus.minormoonson",
-  Name = "Turn ON minor moons and trails",
+  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');
@@ -12,14 +12,14 @@ local minormoons_on = {
     local moons = openspace.getProperty('{moon_minor_uranus}.Renderable.Enabled');
     local moons_fade = openspace.getProperty('{moon_minor_uranus}.Renderable.Fade');
 
-    for i, v in pairs(trails_fade) do 
+    for i, v in pairs(trails_fade) do
       openspace.setPropertyValueSingle(trails[i], true)
-      openspace.setPropertyValueSingle(v, 1, 2, 'Linear') 
+      openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
     end
 
-    for i, v in pairs(moons_fade) do 
+    for i, v in pairs(moons_fade) do
       openspace.setPropertyValueSingle(moons[i], true)
-      openspace.setPropertyValueSingle(v, 1, 2, 'Linear') 
+      openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
     end
   ]],
   Documentation = "Turn ON Uranus's minor moons and their trails",
@@ -29,7 +29,7 @@ local minormoons_on = {
 
 local minormoons_off = {
   Identifier = "os.solarsystem.uranus.minormoonsoff",
-  Name = "Turn OFF minors moon and trails",
+  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');
@@ -37,12 +37,12 @@ local minormoons_off = {
     local moons = openspace.getProperty('{moon_minor_uranus}.Renderable.Enabled');
     local moons_fade = openspace.getProperty('{moon_minor_uranus}.Renderable.Fade');
 
-    for i, v in pairs(trails_fade) do 
-      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" ) 
+    for i, v in pairs(trails_fade) do
+      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" )
     end
 
     for i, v in pairs(moons_fade) do
-      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" ) 
+      openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" )
     end
   ]],
   Documentation = "Turn OFF Uranus's minor moons and their trails",
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 5e156d9429..59aaad0fdc 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
@@ -15,7 +15,7 @@ local layer = {
     into sinusoidal, Mercator, and north and south polar stereographic projections
     at a resolution of 5 kilometers per pixel (4641 meters per pixel [m])]],
   FilePath = asset.localResource("magellan_utah.wms"),
-  TilePixelSize = 64,
+  TilePixelSize = 256,
   Settings = {
     Gamma = 1.72,
     Multiplier = 1.1
diff --git a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
index 4720ade3cf..59e9fbb6b4 100644
--- a/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
+++ b/data/assets/scene/solarsystem/sssb/centaur_asteroid.asset
@@ -47,6 +47,6 @@ asset.meta = {
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
   URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi",
   License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010.
-    All documents available from this server may be protected under the U.S. and 
+    All documents available from this server may be protected under the U.S. and
     Foreign Copyright Laws]]
 }
diff --git a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
index 494ff0f797..33e924ef3e 100644
--- a/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
+++ b/data/assets/scene/solarsystem/sssb/encke-type_comet.asset
@@ -47,6 +47,6 @@ asset.meta = {
   Author = "JPL Small-Body Database hosted by California Institute of Technology",
   URL = "https://ssd.jpl.nasa.gov/sbdb_query.cgi",
   License = [[JPL-authored documents are sponsored by NASA under Contract NAS7-030010.
-    All documents available from this server may be protected under the U.S. and 
+    All documents available from this server may be protected under the U.S. and
     Foreign Copyright Laws]]
 }
diff --git a/data/assets/scene/solarsystem/sun/EUV_layer.asset b/data/assets/scene/solarsystem/sun/EUV_layer.asset
index 6ec99ebad3..31eb818d07 100644
--- a/data/assets/scene/solarsystem/sun/EUV_layer.asset
+++ b/data/assets/scene/solarsystem/sun/EUV_layer.asset
@@ -32,7 +32,7 @@ local EUVLayer = {
 
 local toggle_EUV_layer = {
   Identifier = "os.solarsystem.sun.toggleeuv",
-  Name = "Toggle EUV Layer",
+  Name = "Toggle EUV layer",
   Command = propertyHelper.invert("Scene.EUV-Layer-bastille-day-2000.Renderable.Enabled"),
   Documentation = "Toggle EUV layer of sun",
   GuiPath = "/Bastille-Day 2000",
@@ -55,8 +55,7 @@ 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]],
+  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",
   License = "CC-BY"
diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset
index 6f497ca306..501580dba7 100644
--- a/data/assets/scene/solarsystem/sun/glare.asset
+++ b/data/assets/scene/solarsystem/sun/glare.asset
@@ -19,8 +19,7 @@ local SunGlare = {
     Billboard = true,
     Texture = textures .. "halo.png",
     BlendMode = "Additive",
-    Opacity = 0.65,
-    RenderBinMode = "PreDeferredTransparent"
+    Opacity = 0.65
   },
   GUI = {
     Name = "Sun Glare",
diff --git a/data/assets/scene/solarsystem/sun/habitablezone.asset b/data/assets/scene/solarsystem/sun/habitablezone.asset
index b6852e07d7..e62aed1a72 100644
--- a/data/assets/scene/solarsystem/sun/habitablezone.asset
+++ b/data/assets/scene/solarsystem/sun/habitablezone.asset
@@ -34,7 +34,7 @@ asset.export(HabitableZone)
 asset.meta = {
   Name = "Sun Habitable Zone",
   Version = "1.1",
-  Description = [[The habitable zone around our sun, computed using formula and 
+  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",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/util/default_keybindings.asset b/data/assets/util/default_keybindings.asset
index 4e7026033a..6a74947420 100644
--- a/data/assets/util/default_keybindings.asset
+++ b/data/assets/util/default_keybindings.asset
@@ -2,7 +2,7 @@ local propertyHelper = asset.require("./property_helper")
 
 local toggle_native_ui = {
   Identifier = "os_default.toggle_native_ui",
-  Name = "Show Native GUI",
+  Name = "Show native GUI",
   Command = propertyHelper.invert("Modules.ImGUI.Enabled"),
   Documentation = "Shows or hides the native UI",
   GuiPath = "/System/GUI",
@@ -13,9 +13,10 @@ local toggle_native_ui = {
 
 local toggle_shutdown = {
   Identifier = "os_default.toggle_shutdown",
-  Name = "Toggle Shutdown",
+  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",
+  GuiPath = "/System",
   IsLocal = true,
 
   Key = "ESC"
@@ -23,7 +24,7 @@ local toggle_shutdown = {
 
 local take_screenshot = {
   Identifier = "os_default.take_screenshot",
-  Name = "Take Screenshot",
+  Name = "Take screenshot",
   Command = "openspace.takeScreenshot()",
   Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory",
   GuiPath = "/System/Rendering",
@@ -34,7 +35,7 @@ local take_screenshot = {
 
 local toggle_pause_interpolated = {
   Identifier = "os_default.toggle_pause_interpolated",
-  Name = "Toggle Pause (Interpolated)",
+  Name = "Toggle pause (interpolate)",
   Command = "openspace.time.pauseToggleViaKeyboard()",
   Documentation = "Smoothly starts and stops the simulation time",
   GuiPath = "/Time/Simulation Speed",
@@ -45,7 +46,7 @@ local toggle_pause_interpolated = {
 
 local toggle_pause_immediate = {
   Identifier = "os_default.toggle_pause_immediate",
-  Name = "Toggle Pause (Immediate)",
+  Name = "Toggle pause (immediate)",
   Command = "openspace.time.togglePause()",
   Documentation = "Immediately starts and stops the simulation time",
   GuiPath = "/Time/Simulation Speed",
@@ -56,7 +57,7 @@ local toggle_pause_immediate = {
 
 local toggle_rotation_friction = {
   Identifier = "os_default.toggle_rotation_friction",
-  Name = "Toggle Rotation friction",
+  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",
   GuiPath = "/Navigation",
@@ -67,7 +68,7 @@ local toggle_rotation_friction = {
 
 local toggle_zoom_friction = {
   Identifier = "os_default.toggle_zoom_friction",
-  Name = "Toggle Zoom Friction",
+  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",
   GuiPath = "/Navigation",
@@ -78,7 +79,7 @@ local toggle_zoom_friction = {
 
 local toggle_roll_friction = {
   Identifier = "os_default.toggle_roll_friction",
-  Name = "Toggle Roll Friction",
+  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",
   GuiPath = "/Navigation",
@@ -144,9 +145,9 @@ local toggle_master_rendering = {
 
 local next_delta_step_interpolate = {
   Identifier = "os_default.next_delta_step_interpolate",
-  Name = "Next Delta Time Step (Interpolate)",
+  Name = "Next simulation time step (interpolate)",
   Command = "openspace.time.interpolateNextDeltaTimeStep()",
-  Documentation = "Smoothly interpolates the simulation speed to the next delta 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,
 
@@ -155,9 +156,9 @@ local next_delta_step_interpolate = {
 
 local next_delta_step_immediate = {
   Identifier = "os_default.next_delta_step_immediate",
-  Name = "Next Delta Time Step (Immediate)",
+  Name = "Next simulation time step (immediate)",
   Command = "openspace.time.setNextDeltaTimeStep()",
-  Documentation = "Immediately set the simulation speed to the next delta 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,
 
@@ -166,9 +167,9 @@ local next_delta_step_immediate = {
 
 local previous_delta_step_interpolate = {
   Identifier = "os_default.previous_delta_step_interpolate",
-  Name = "Previous Delta Time Step (Interpolate)",
+  Name = "Previous simulation time step (interpolate)",
   Command = "openspace.time.interpolatePreviousDeltaTimeStep()",
-  Documentation = "Smoothly interpolates the simulation speed to the previous delta 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,
 
@@ -177,35 +178,21 @@ local previous_delta_step_interpolate = {
 
 local previous_delta_step_immediate = {
   Identifier = "os_default.previous_delta_step_immediate",
-  Name = "Previous Delta Time Step (Immediate)",
+  Name = "Previous simulation time step (immediate)",
   Command = "openspace.time.setPreviousDeltaTimeStep()",
-  Documentation = "Immediately set the simulation speed to the previous delta 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,
 
   Key = "Shift+Left"
 }
 
-local toggle_planet_labels = {
-  Identifier = "os_default.toggle_planet_labels",
-  Name = "Toggle planet labels",
-  Command = [[
-    local list = openspace.getProperty("{solarsystem_labels}.Renderable.Enabled");
-    for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
-  ]],
-  Documentation = "Turns on visibility for all solar system labels",
-  GuiPath = "/Solar System",
-  IsLocal = false,
-  Key = "l"
-}
-
-
-
 local Actions = {
-  toggle_native_ui,toggle_shutdown,take_screenshot,toggle_pause_interpolated,toggle_pause_immediate,
-  toggle_rotation_friction,toggle_zoom_friction,toggle_roll_friction,fade_to_black,
-  toggle_main_gui,toggle_overlays,toggle_master_rendering,next_delta_step_interpolate,
-  next_delta_step_immediate,previous_delta_step_interpolate,previous_delta_step_immediate
+  toggle_native_ui, toggle_shutdown, take_screenshot, toggle_pause_interpolated,
+  toggle_pause_immediate, toggle_rotation_friction, toggle_zoom_friction,
+  toggle_roll_friction, fade_to_black, toggle_main_gui, toggle_overlays,
+  toggle_master_rendering, next_delta_step_interpolate, next_delta_step_immediate,
+  previous_delta_step_interpolate, previous_delta_step_immediate
 }
 
 asset.onInitialize(function()
diff --git a/data/assets/util/lua_state_machine_helper.asset b/data/assets/util/lua_state_machine_helper.asset
index eeca3748c5..863db0b0b7 100644
--- a/data/assets/util/lua_state_machine_helper.asset
+++ b/data/assets/util/lua_state_machine_helper.asset
@@ -1,4 +1,4 @@
--- Contains the required functions to create a simple Lua state machine, that can step 
+-- Contains the required functions to create a simple Lua state machine, that can step
 -- forwards and backwards through a list of states.
 --
 -- A state is given as a table with a Title string, and two functions: Play and Rewind
diff --git a/data/assets/util/testing_keybindings.asset b/data/assets/util/testing_keybindings.asset
index 48f1991826..c40489a1a7 100644
--- a/data/assets/util/testing_keybindings.asset
+++ b/data/assets/util/testing_keybindings.asset
@@ -4,7 +4,7 @@ local propertyHelper = asset.require("./property_helper")
 
 local take_screenshot = {
   Identifier = "testing_keyboard.take_screenshot",
-  Name = "Take Screenshot",
+  Name = "Take screenshot",
   Command = "openspace.takeScreenshot()",
   Documentation = "Saves the contents of the screen to a file in the ${SCREENSHOTS} directory",
   GuiPath = "/Rendering",
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 5fc1f3f4dd..3e808f2f32 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -3,7 +3,7 @@ asset.require("./static_server")
 local guiCustomization = asset.require("customization/gui")
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "4a27a71ccc7dd67f3efa6c54c6f04da71d99ffc2"
+local frontendHash = "cf11c5ac6e0c62f1f2a82dfab7b7ec8db614a643"
 local dataProvider = "data.openspaceproject.com/files/webgui"
 
 local frontend = asset.syncedResource({
diff --git a/data/profiles/apollo.profile b/data/profiles/apollo.profile
index febd2de247..8b4752c377 100644
--- a/data/profiles/apollo.profile
+++ b/data/profiles/apollo.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/missions/apollo/8/apollo8",
     "scene/solarsystem/missions/apollo/11/apollo11",
     "scene/solarsystem/missions/apollo/11/lem_flipbook",
@@ -110,4 +111,4 @@
     "major": 1,
     "minor": 1
   }
-}
\ No newline at end of file
+}
diff --git a/data/profiles/asteroids.profile b/data/profiles/asteroids.profile
index 764981f458..251a241ab2 100644
--- a/data/profiles/asteroids.profile
+++ b/data/profiles/asteroids.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/interstellar/c-2019_q4_borisov",
     "scene/solarsystem/interstellar/oumuamua",
     "scene/solarsystem/sssb/amor_asteroid",
@@ -64,12 +65,105 @@
     "url": "https://www.openspaceproject.com",
     "version": "1.0"
   },
+  "properties": [
+    {
+      "name": "Scene.sssb_transneptunian_object_asteroid.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_amor_asteroid.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_apollo_asteroid.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_aten_asteroid.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_atira_asteroid.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_centaur_asteroid.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_jupiter_trojan_asteroid.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_jupiter-family_comet.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_mars-crossing_asteroid.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_pha.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_outer_main_belt_asteroid.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_main_belt_asteroid.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_chiron-type_comet.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_encke-type_comet.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_halley-type_comet.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.sssb_inner_main_belt_asteroid.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.C2019Q4BorisovTrail.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    },
+    {
+      "name": "Scene.OumuamuaTrail.Renderable.Fade",
+      "type": "setPropertyValueSingle",
+      "value": "0"
+    }
+  ],
   "time": {
+    "is_paused": false,
     "type": "relative",
     "value": "-1d"
   },
   "version": {
     "major": 1,
-    "minor": 0
+    "minor": 2
   }
-}
+}
\ No newline at end of file
diff --git a/data/profiles/bastilleday2000.profile b/data/profiles/bastilleday2000.profile
index 7975cb4492..46c0379e14 100644
--- a/data/profiles/bastilleday2000.profile
+++ b/data/profiles/bastilleday2000.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "dashboard/default_dashboard",
     "scene/solarsystem/heliosphere/bastille_day/actions",
     "scene/solarsystem/heliosphere/bastille_day/density_volume",
diff --git a/data/profiles/dawn.profile b/data/profiles/dawn.profile
index 77e8f29ee3..8a5f89f46b 100644
--- a/data/profiles/dawn.profile
+++ b/data/profiles/dawn.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/dwarf_planets/ceres/ceres",
     "scene/solarsystem/dwarf_planets/ceres/default_layers",
     "scene/solarsystem/dwarf_planets/ceres/trail",
diff --git a/data/profiles/default.profile b/data/profiles/default.profile
index ec5bcab272..ef68dbd24c 100644
--- a/data/profiles/default.profile
+++ b/data/profiles/default.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "events/toggle_sun",
     "scene/solarsystem/planets/earth/earth",
     "scene/solarsystem/planets/earth/satellites/satellites"
diff --git a/data/profiles/default_full.profile b/data/profiles/default_full.profile
index b191457fef..551282e242 100644
--- a/data/profiles/default_full.profile
+++ b/data/profiles/default_full.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "events/toggle_sun",
     "scene/solarsystem/planets/earth/earth",
     "scene/solarsystem/planets/earth/satellites/satellites",
diff --git a/data/profiles/gaia.profile b/data/profiles/gaia.profile
index 941db99b3a..ff834c694c 100644
--- a/data/profiles/gaia.profile
+++ b/data/profiles/gaia.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "scene/milkyway/gaia/apogee",
     "scene/milkyway/gaia/gaiastars",
     "scene/milkyway/gaia/galah",
diff --git a/data/profiles/juice.profile b/data/profiles/juice.profile
index 947f087d97..63b7024a45 100644
--- a/data/profiles/juice.profile
+++ b/data/profiles/juice.profile
@@ -1,9 +1,7 @@
 {
-  "additional_scripts": [
-    ""
-  ],
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/missions/juice/fieldlines",
     "scene/solarsystem/missions/juice/fov/janus",
     "scene/solarsystem/missions/juice/fov/navcam",
diff --git a/data/profiles/juno.profile b/data/profiles/juno.profile
index a43863c26f..99d8c8e30c 100644
--- a/data/profiles/juno.profile
+++ b/data/profiles/juno.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/missions/juno/juno"
   ],
   "camera": {
@@ -61,4 +62,4 @@
     "major": 1,
     "minor": 0
   }
-}
\ No newline at end of file
+}
diff --git a/data/profiles/jwst.profile b/data/profiles/jwst.profile
index 07439f6c33..eb836a4329 100644
--- a/data/profiles/jwst.profile
+++ b/data/profiles/jwst.profile
@@ -4,6 +4,7 @@
   ],
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/planets/earth/earth",
     "scene/solarsystem/planets/earth/satellites/satellites",
     "scene/solarsystem/planets/earth/satellites/misc/hubble_trail",
diff --git a/data/profiles/mars.profile b/data/profiles/mars.profile
index 5eb8a9b4c0..3a2931d7ae 100644
--- a/data/profiles/mars.profile
+++ b/data/profiles/mars.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/missions/insight/edl",
     "scene/solarsystem/missions/perseverance/perseverance"
   ],
diff --git a/data/profiles/messenger.profile b/data/profiles/messenger.profile
index 9401e55fbd..df4a1bb323 100644
--- a/data/profiles/messenger.profile
+++ b/data/profiles/messenger.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/missions/messenger/dashboard",
     "scene/solarsystem/missions/messenger/mercurymagnetosphere",
     "scene/solarsystem/missions/messenger/messengerSC"
@@ -41,7 +42,7 @@
   ],
   "meta": {
     "author": "OpenSpace Team",
-    "description": "This scene contains model and trajectory of the NASA MESSENGER spacecraft with craft pointing data from 2011-03 to 2011-06. In addition, a rendering of Mercury’s magnetosphere based on data recorded by MESSENGER can be enabled and viewed around the planet. Along with the mission data, additional maps were added to Mercury showing mineral abundances on the surface and a multi-color mosaic from the MDIS instrument",
+    "description": "This scene contains model and trajectory of the NASA MESSENGER spacecraft with craft pointing data from 2011-03 to 2011-06. In addition, a rendering of Mercury's magnetosphere based on data recorded by MESSENGER can be enabled and viewed around the planet. Along with the mission data, additional maps were added to Mercury showing mineral abundances on the surface and a multi-color mosaic from the MDIS instrument",
     "license": "MIT License",
     "name": "Messenger",
     "url": "https://www.openspaceproject.com",
diff --git a/data/profiles/newhorizons.profile b/data/profiles/newhorizons.profile
index 80a82748d3..f7a326680b 100644
--- a/data/profiles/newhorizons.profile
+++ b/data/profiles/newhorizons.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/missions/newhorizons/dashboard",
     "scene/solarsystem/missions/newhorizons/model",
     "scene/solarsystem/missions/newhorizons/newhorizons"
diff --git a/data/profiles/osirisrex.profile b/data/profiles/osirisrex.profile
index a351f29964..ae41edf7b6 100644
--- a/data/profiles/osirisrex.profile
+++ b/data/profiles/osirisrex.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/missions/osirisrex/dashboard",
     "scene/solarsystem/missions/osirisrex/model",
     "scene/solarsystem/missions/osirisrex/osirisrex",
diff --git a/data/profiles/rosetta.profile b/data/profiles/rosetta.profile
index 871ee447e2..578acc8752 100644
--- a/data/profiles/rosetta.profile
+++ b/data/profiles/rosetta.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/missions/rosetta/67p",
     "scene/solarsystem/missions/rosetta/dashboard",
     "scene/solarsystem/missions/rosetta/rosetta",
diff --git a/data/profiles/solarstorm2012.profile b/data/profiles/solarstorm2012.profile
index 43542d1842..1f34322d4c 100644
--- a/data/profiles/solarstorm2012.profile
+++ b/data/profiles/solarstorm2012.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "dashboard/default_dashboard",
     "scene/solarsystem/heliosphere/2012/sun_earth_2012_fieldlines",
     "scene/solarsystem/planets/earth/magnetosphere/magnetosphere",
diff --git a/data/profiles/touch.profile b/data/profiles/touch.profile
index 2609bf1582..c7a3813303 100644
--- a/data/profiles/touch.profile
+++ b/data/profiles/touch.profile
@@ -3,7 +3,8 @@
     "openspace.setPropertyValueSingle(\"Modules.CefWebGui.GuiUrl\", 'http://127.0.0.1:4680/frontend/#/ontouch');"
   ],
   "assets": [
-    "base"
+    "base",
+    "base_keybindings"
   ],
   "camera": {
     "altitude": 20000000.0,
diff --git a/data/profiles/voyager.profile b/data/profiles/voyager.profile
index a70894c477..a47977b852 100644
--- a/data/profiles/voyager.profile
+++ b/data/profiles/voyager.profile
@@ -1,6 +1,7 @@
 {
   "assets": [
     "base",
+    "base_keybindings",
     "scene/solarsystem/missions/voyager/dashboard",
     "scene/solarsystem/missions/voyager/mission",
     "scene/solarsystem/missions/voyager/voyager1",
diff --git a/data/test.jpg b/data/test.jpg
new file mode 100644
index 0000000000..e526e5789d
Binary files /dev/null and b/data/test.jpg differ
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index 0fca1bcb60..d63fbc5086 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -25,6 +25,7 @@
 #ifndef __OPENSPACE_CORE___CONFIGURATION___H__
 #define __OPENSPACE_CORE___CONFIGURATION___H__
 
+#include <openspace/util/keys.h>
 #include <ghoul/lua/luastate.h>
 #include <ghoul/misc/dictionary.h>
 #include <filesystem>
@@ -91,6 +92,8 @@ struct Configuration {
     bool isLoggingOpenGLCalls = false;
     bool isPrintingEvents = false;
 
+    Key consoleKey = Key::GraveAccent;
+
     float shutdownCountdown = 0.f;
 
     bool shouldUseScreenshotDate = false;
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 74a0607bb5..16c5fa23ac 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -29,8 +29,9 @@
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/propertyowner.h>
 #include <openspace/properties/property.h>
-#include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/stringproperty.h>
 #include <openspace/scene/profile.h>
 #include <openspace/util/keys.h>
 #include <openspace/util/mouse.h>
@@ -145,6 +146,7 @@ private:
     properties::BoolProperty _printEvents;
     properties::OptionProperty _visibility;
     properties::BoolProperty _showHiddenSceneGraphNodes;
+    properties::FloatProperty _fadeOnEnableDuration;
     properties::BoolProperty _disableAllMouseInputs;
 
     std::unique_ptr<Scene> _scene;
diff --git a/include/openspace/interaction/action.h b/include/openspace/interaction/action.h
index af46d8c787..a0f21bd76b 100644
--- a/include/openspace/interaction/action.h
+++ b/include/openspace/interaction/action.h
@@ -31,7 +31,7 @@
 namespace openspace::interaction {
 
 struct Action {
-    BooleanType(IsSynchronized);
+    BooleanType(IsLocal);
 
     /// Unique identifier that identifies this action. There is no special naming scheme
     /// that we enforce, we are trying to stick to the same . separated structure that
@@ -59,10 +59,11 @@ struct Action {
     /// for the root path
     std::string guiPath = "/";
 
-    /// If this value is set to `Yes`, the execution of this action is synchronized to
-    /// other OpenSpace instances, for example other nodes in a cluster environment, or
-    /// to other OpenSpace instances using a parallel connection
-    IsSynchronized synchronization = IsSynchronized::Yes;
+    /// If this value is set to `Yes`, the execution of this action is restricted to the
+    /// 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;
 };
 
 } // namespace openspace::interaction
diff --git a/include/openspace/rendering/fadeable.h b/include/openspace/rendering/fadeable.h
new file mode 100644
index 0000000000..5caf218e00
--- /dev/null
+++ b/include/openspace/rendering/fadeable.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___FADEABLE___H__
+#define __OPENSPACE_CORE___FADEABLE___H__
+
+#include <openspace/properties/scalar/floatproperty.h>
+
+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 Fadeable can also be dependent on the fade value from a specified parent fadeable,
+ * so that it fades out together with the parent
+ */
+class Fadeable {
+public:
+    Fadeable();
+    virtual ~Fadeable() = default;
+
+    void setFade(float fade);
+    void setParentFadeable(Fadeable* parent);
+
+    float fade() const;
+    virtual bool isVisible() const;
+
+    /// Returns the full opacity constructed from the _opacity and _fade property values
+    virtual float opacity() const noexcept;
+
+protected:
+    properties::FloatProperty _opacity;
+    properties::FloatProperty _fade;
+
+    Fadeable* _parentFadeable = nullptr;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_CORE___FADEABLE___H__
diff --git a/include/openspace/rendering/luaconsole.h b/include/openspace/rendering/luaconsole.h
index 88086bc3c0..f7a828fb97 100644
--- a/include/openspace/rendering/luaconsole.h
+++ b/include/openspace/rendering/luaconsole.h
@@ -58,6 +58,8 @@ public:
     void render();
     float currentHeight() const;
 
+    void setCommandInputButton(Key key);
+
 private:
     void parallelConnectionChanged(const ParallelConnection::Status& status);
 
@@ -71,6 +73,8 @@ private:
     properties::Vec4Property _historyTextColor;
     properties::IntProperty _historyLength;
 
+    Key _commandInputButton = Key::GraveAccent;
+
     size_t _inputPosition = 0;
     std::vector<std::string> _commandsHistory;
     size_t _activeCommand = 0;
diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index ba411b493c..fa3fd4971d 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_CORE___RENDERABLE___H__
 
 #include <openspace/properties/propertyowner.h>
+#include <openspace/rendering/fadeable.h>
 
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/doubleproperty.h>
@@ -52,8 +53,13 @@ namespace documentation { struct Documentation; }
 
 class Camera;
 
-class Renderable : public properties::PropertyOwner {
+class Renderable : public properties::PropertyOwner, public Fadeable {
 public:
+    struct Settings {
+        bool automaticallyUpdateRenderBin = true;
+        bool shouldUpdateIfDisabled = false;
+    };
+
     enum class RenderBin : int {
         Background = 1,
         Opaque = 2,
@@ -65,7 +71,7 @@ public:
     static ghoul::mm_unique_ptr<Renderable> createFromDictionary(
         ghoul::Dictionary dictionary);
 
-    Renderable(const ghoul::Dictionary& dictionary);
+    Renderable(const ghoul::Dictionary& dictionary, Settings settings = Settings());
     virtual ~Renderable() override = default;
 
     virtual void initialize();
@@ -75,12 +81,12 @@ public:
 
     virtual bool isReady() const = 0;
     bool isEnabled() const;
-    bool shouldUpdateIfDisabled() const;
+    bool shouldUpdateIfDisabled() const noexcept;
 
-    double boundingSphere() const;
-    double interactionSphere() const;
+    double boundingSphere() const noexcept;
+    double interactionSphere() const noexcept;
 
-    std::string_view typeAsString() const;
+    std::string_view typeAsString() const noexcept;
 
     virtual void update(const UpdateData& data);
     virtual void render(const RenderData& data, RendererTasks& rendererTask);
@@ -102,9 +108,7 @@ public:
 
     bool matchesSecondaryRenderBin(int binMask) const noexcept;
 
-    void setFade(float fade);
-
-    bool isVisible() const;
+    bool isVisible() const override;
 
     void onEnabledChange(std::function<void(bool)> callback);
 
@@ -112,8 +116,6 @@ public:
 
 protected:
     properties::BoolProperty _enabled;
-    properties::FloatProperty _opacity;
-    properties::FloatProperty _fade;
     properties::StringProperty _renderableType;
     properties::BoolProperty _dimInAtmosphere;
 
@@ -121,15 +123,14 @@ protected:
     void setInteractionSphere(double interactionSphere);
 
     void setRenderBinFromOpacity();
-    void registerUpdateRenderBinFromOpacity();
 
     /// Returns the full opacity constructed from the _opacity and _fade property values
-    float opacity() const;
+    float opacity() const noexcept override;
+
+    SceneGraphNode* parent() const noexcept;
+
+    bool automaticallyUpdatesRenderBin() const noexcept;
 
-    double _boundingSphere = 0.0;
-    double _interactionSphere = 0.0;
-    SceneGraphNode* _parent = nullptr;
-    bool _shouldUpdateIfDisabled = false;
     RenderBin _renderBin = RenderBin::Opaque;
 
     // An optional renderbin that renderables can use for certain components, in cases
@@ -137,6 +138,14 @@ protected:
     std::optional<RenderBin> _secondaryRenderBin;
 
 private:
+    void registerUpdateRenderBinFromOpacity();
+
+    double _boundingSphere = 0.0;
+    double _interactionSphere = 0.0;
+    SceneGraphNode* _parent = nullptr;
+    const bool _shouldUpdateIfDisabled = false;
+    bool _automaticallyUpdateRenderBin = true;
+
     // 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/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 5db751bd60..93b03efe17 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_CORE___SCREENSPACERENDERABLE___H__
 
 #include <openspace/properties/propertyowner.h>
+#include <openspace/rendering/fadeable.h>
 
 #include <openspace/properties/triggerproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
@@ -49,7 +50,7 @@ namespace documentation { struct Documentation; }
  * 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 {
+class ScreenSpaceRenderable : public properties::PropertyOwner, public Fadeable {
 public:
     static std::unique_ptr<ScreenSpaceRenderable> createFromDictionary(
         const ghoul::Dictionary& dictionary);
@@ -111,7 +112,6 @@ protected:
     glm::vec3 cartesianToSpherical(const glm::vec3& cartesian) const;
     glm::vec3 sphericalToCartesian(glm::vec3 spherical) const;
     glm::vec3 sanitizeSphericalCoordinates(glm::vec3 spherical) const;
-    float opacity() const;
 
     properties::BoolProperty _enabled;
     properties::BoolProperty _usePerspectiveProjection;
@@ -133,8 +133,6 @@ protected:
     properties::FloatProperty _gamma;
     properties::Vec3Property _multiplyColor;
     properties::Vec4Property _backgroundColor;
-    properties::FloatProperty _opacity;
-    properties::FloatProperty _fade;
     properties::TriggerProperty _delete;
 
     glm::ivec2 _objectSize = glm::ivec2(0);
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index 949ca1afaf..188d20bad6 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -346,7 +346,7 @@ private:
         std::chrono::time_point<std::chrono::steady_clock> beginTime;
         float durationSeconds;
         std::string postScript;
-        
+
         ghoul::EasingFunc<float> easingFunction;
         bool isExpired = false;
     };
@@ -355,6 +355,9 @@ private:
     ghoul::MemoryPool<4096> _memoryPool;
 };
 
+// Convert the input string to a format that is valid as an identifier
+std::string makeIdentifier(std::string str);
+
 } // namespace openspace
 
 #endif // __OPENSPACE_CORE___SCENE___H__
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 4473f38255..14f425a5d0 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -91,7 +91,7 @@ function (get_module_attribute_supported path result)
 endfunction()
 
 
-# Returns the path for the 'module_name'. If the module has not been seen before by 
+# Returns the path for the 'module_name'. If the module has not been seen before by
 # get_individual_modules, an empty string is returned
 function (find_path_for_module module_name module_names module_paths result)
   list(FIND module_names ${module_name} i)
@@ -121,7 +121,7 @@ function (get_recursive_dependencies module_name module_path module_names module
           "${module_names}" "${module_paths}"
           res
         )
-        # 1. We add "base" to the list of dependencies as we always want it 
+        # 1. We add "base" to the list of dependencies as we always want it
         # 2. We add dependencies in this order such that when we later traverse
         #    this list, we automatically get them in the correct order (meaning
         #    that we include a dependency first)
@@ -241,7 +241,7 @@ foreach (val RANGE ${enabled_module_count})
   set(dependencies ${dependencies} ${deps})
 endforeach()
 
-# We can remove the duplicates here.  We constructed the list such that nested 
+# We can remove the duplicates here.  We constructed the list such that nested
 # dependencies are order left to right.  REMOVE_DUPLICATES will keep the left most
 # value in the case of duplicates, so that will still work
 list(REMOVE_DUPLICATES dependencies)
diff --git a/modules/atmosphere/CMakeLists.txt b/modules/atmosphere/CMakeLists.txt
index abc62c3d4c..b49ac4af6c 100644
--- a/modules/atmosphere/CMakeLists.txt
+++ b/modules/atmosphere/CMakeLists.txt
@@ -38,7 +38,7 @@ source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
   shaders/atmosphere_common.glsl
-  shaders/atmosphere_deferred_vs.glsl 
+  shaders/atmosphere_deferred_vs.glsl
   shaders/atmosphere_deferred_fs.glsl
   shaders/calculation_gs.glsl
   shaders/calculation_vs.glsl
diff --git a/modules/atmosphere/shaders/atmosphere_common.glsl b/modules/atmosphere/shaders/atmosphere_common.glsl
index 7823e3e9a3..6326205d0f 100644
--- a/modules/atmosphere/shaders/atmosphere_common.glsl
+++ b/modules/atmosphere/shaders/atmosphere_common.glsl
@@ -24,7 +24,7 @@
 
 /*****************************************************************************************
  * Modified parts of the code (4D texture mechanism, analytical transmittance etc)       *
- * from Eric Bruneton is used in the following code.                                     * 
+ * from Eric Bruneton is used in the following code.                                     *
  ****************************************************************************************/
 
 /**
@@ -67,17 +67,17 @@ const float ATM_EPSILON = 1.0;
 // Calculate the distance of the ray starting at x (height r) until the planet's ground
 // or top of atmosphere
 // r := || vec(x) || e [0, Rt]
-// mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r 
+// mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
 float rayDistance(float r, float mu, float Rt, float Rg) {
   // The light ray starting at the observer in/on the atmosphere can have to possible end
   // points: the top of the atmosphere or the planet ground. So the shortest path is the
   // one we are looking for, otherwise we may be passing through the ground
-  
+
   // cosine law
   float atmRadiusEps2 = (Rt + ATM_EPSILON) * (Rt + ATM_EPSILON);
   float mu2 = mu * mu;
   float r2 = r * r;
-  float rayDistanceAtmosphere = -r * mu + sqrt(r2 * (mu2 - 1.0) + atmRadiusEps2); 
+  float rayDistanceAtmosphere = -r * mu + sqrt(r2 * (mu2 - 1.0) + atmRadiusEps2);
   float delta = r2 * (mu2 - 1.0) + Rg*Rg;
 
   // Ray may be hitting ground
@@ -108,7 +108,7 @@ void unmappingMuMuSunNu(float r, vec4 dhdH, int SAMPLES_MU, float Rg, float Rt,
   // Pre-calculations
   float r2  = r * r;
   float Rg2 = Rg * Rg;
-  
+
   float halfSAMPLE_MU = float(SAMPLES_MU) / 2.0;
   // If the (vec(x) dot vec(v))/r is negative, i.e., the light ray has great probability
   // to touch the ground, we obtain mu considering the geometry of the ground
@@ -130,7 +130,7 @@ void unmappingMuMuSunNu(float r, vec4 dhdH, int SAMPLES_MU, float Rg, float Rt,
     // cosine law: Rt^2 = r^2 + d^2 - 2rdcos(pi-theta) where cosine(theta) = mu
     mu = (Rt*Rt - r2 - d * d) / (2.0 * r * d);
   }
-  
+
   float modValueMuSun = mod(fragment.x, float(SAMPLES_MU_S)) / (float(SAMPLES_MU_S) - 1.0);
   // The following mapping is different from the paper. See Collienne for an details.
   muSun = tan((2.0 * modValueMuSun - 1.0 + 0.26) * 1.1) / tan(1.26 * 1.1);
@@ -148,7 +148,7 @@ vec3 transmittance(sampler2D tex, float r, float mu, float Rg, float Rt) {
   float u_r = sqrt((r - Rg) / (Rt - Rg));
   // See Collienne to understand the mapping
   float u_mu = atan((mu + 0.15) / 1.15 * tan(1.5)) / 1.5;
-  
+
   return texture(tex, vec2(u_mu, u_r)).rgb;
 }
 
@@ -161,7 +161,7 @@ vec3 transmittance(sampler2D tex, float r, float mu, float d, float Rg, float Rt
   // Here we use the transmittance property: T(x,v) = T(x,d)*T(d,v) to, given a distance
   // d, calculates that transmittance along that distance starting in x (height r):
   // T(x,d) = T(x,v)/T(d,v).
-  // 
+  //
   // From cosine law: c^2 = a^2 + b^2 - 2*a*b*cos(ab)
   float ri = sqrt(d * d + r * r + 2.0 * r * d * mu);
   // mu_i = (vec(d) dot vec(v)) / r_i
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index f3f8eb96b5..4789e2ba2d 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -24,7 +24,7 @@
 
 /*****************************************************************************************
  * Modified parts of the code (4D texture mechanism) from Eric Bruneton is used in the   *
- * following code.                                                                       * 
+ * following code.                                                                       *
  ****************************************************************************************/
 
  /**
@@ -86,7 +86,7 @@ uniform sampler3D inscatterTexture;
 uniform sampler2D mainPositionTexture;
 uniform sampler2D mainNormalTexture;
 uniform sampler2D mainColorTexture;
-uniform dmat4 inverseModelTransformMatrix; 
+uniform dmat4 inverseModelTransformMatrix;
 uniform dmat4 modelTransformMatrix;
 uniform dmat4 viewToWorldMatrix;
 uniform dmat4 projectionToModelTransformMatrix;
@@ -129,13 +129,13 @@ float calcShadow(ShadowRenderingStruct shadowInfoArray[numberOfShadows], dvec3 p
   dvec3 scNorm = shadowInfoArray[0].sourceCasterVec;
   dvec3 pcProj = dot(pc, scNorm) * scNorm;
   dvec3 d = pc - pcProj;
-  
+
   float length_d = float(length(d));
   double lengthPcProj = length(pcProj);
-  
+
   float r_p_pi = float(shadowInfoArray[0].rc * (lengthPcProj + shadowInfoArray[0].xp) / shadowInfoArray[0].xp);
   float r_u_pi = float(shadowInfoArray[0].rc * (shadowInfoArray[0].xu - lengthPcProj) / shadowInfoArray[0].xu);
-  
+
   if (length_d < r_u_pi) {
     // umbra
     if (hardShadows) {
@@ -240,7 +240,7 @@ bool atmosphereIntersection(Ray ray, double atmRadius, out double offset,
     offset = 0.0;
     maxLength = s + q;
   }
-  
+
   return true;
 }
 
@@ -257,7 +257,7 @@ Ray calculateRayRenderableGlobe(vec2 st) {
   // Clip to Object Coords
   dvec4 objectCoords = projectionToModelTransformMatrix * clipCoords;
   objectCoords.xyz /= objectCoords.w;
-  
+
   // Building Ray
   // Ray in object space (in KM)
   Ray ray;
@@ -266,7 +266,7 @@ Ray calculateRayRenderableGlobe(vec2 st) {
   return ray;
 }
 
-/* 
+/*
  * Calculates the light scattering in the view direction comming from other light rays
  * scattered in the atmosphere.
  * Following the paper:  S[L]|x - T(x,xs) * S[L]|xs
@@ -274,7 +274,7 @@ Ray calculateRayRenderableGlobe(vec2 st) {
  * position and zenith cosine angle as in the paper.
  * Arguments:
  * x := camera position
- * t := ray displacement variable after calculating the intersection with the 
+ * t := ray displacement variable after calculating the intersection with the
  *      atmosphere. It is the distance from the camera to the last intersection with the
  *      atmosphere. If the ray hits the ground, t is updated to the correct value
  * v := view direction (ray's direction) (normalized)
@@ -292,7 +292,7 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
   const float INTERPOLATION_EPS = 0.004; // precision const from Brunetton
 
   vec3 radiance;
-  
+
   mu = dot(x, v) / r;
 
   float r2 = r * r;
@@ -300,7 +300,7 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
   float muSun = dot(x, s) / r;
   float rayleighPhase = rayleighPhaseFunction(nu);
   float miePhase = miePhaseFunction(nu, mieG);
-    
+
   // S[L](x,s,v)
   // I.e. the next line has the scattering light for the "infinite" ray passing through
   // the atmosphere. If this ray hits something inside the atmosphere, we will subtract
@@ -310,7 +310,7 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
       SAMPLES_MU_S, SAMPLES_NU),
     0.0
   );
-    
+
   // After removing the initial path from camera pos to top of atmosphere (for an
   // observer in the space) we test if the light ray is hitting the atmosphere
   float r0 = length(fragPosObj);
@@ -319,18 +319,18 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
   float mu0 = dot(fragPosObj, v) * invr0;
 
   if ((pixelDepth > INTERPOLATION_EPS) && (pixelDepth < maxLength)) {
-    t = float(pixelDepth);  
+    t = float(pixelDepth);
     groundHit = true;
-    
+
     // Transmittance from point r, direction mu, distance t
     // By Analytical calculation
     // attenuation = analyticTransmittance(r, mu, t);
     // JCC: change from analytical to LUT transmittance to avoid
     // acme on planet surface when looking from far away. (11/02/2017)
-    attenuation = transmittance(transmittanceTexture, r, mu, t, Rg, Rt); 
-    
+    attenuation = transmittance(transmittanceTexture, r, mu, t, Rg, Rt);
+
     // Here we use the idea of S[L](a->b) = S[L](b->a), and get the S[L](x0, v, s)
-    // Then we calculate S[L] = S[L]|x - T(x, x0)*S[L]|x0        
+    // Then we calculate S[L] = S[L]|x - T(x, x0)*S[L]|x0
     // The "infinite" ray hist something inside the atmosphere, so we need to remove
     // the unsused contribution to the final radiance.
     vec4 inscatterFromSurface = texture4D(inscatterTexture, r0, mu0, muSun0, nu, Rg,
@@ -367,13 +367,13 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
     float halfCosineLaw1 = r2 + (t * t);
     float halfCosineLaw2 = 2.0 * r * t;
     r0 = sqrt(halfCosineLaw1 + halfCosineLaw2 * mu);
-    
+
     // From the dot product: cos(theta0) = (x0 dot v)/(||ro||*||v||)
     // mu0 = ((x + t) dot v) / r0
     // mu0 = (x dot v + t dot v) / r0
     // mu0 = (r*mu + t) / r0
     mu0 = (r * mu + t) * (1.0 / r0);
-    
+
     vec4 inScatterAboveX = texture4D(inscatterTexture, r, mu, muSun, nu, Rg,
       SAMPLES_MU, Rt, SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU);
     vec4 inScatterAboveXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu, Rg,
@@ -385,9 +385,9 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
     mu = muHorizon + INTERPOLATION_EPS;
     //r0  = sqrt(r2 + t2 + 2.0 * r * t * mu);
     r0 = sqrt(halfCosineLaw1 + halfCosineLaw2 * mu);
-    
+
     mu0 = (r * mu + t) * (1.0 / r0);
-    
+
     vec4 inScatterBelowX = texture4D(inscatterTexture, r, mu, muSun, nu, Rg,
       SAMPLES_MU, Rt, SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU);
     vec4 inScatterBelowXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu, Rg,
@@ -397,12 +397,12 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
 
     // Interpolate between above and below inScattering radiance
     inscatterRadiance = mix(inScatterAbove, inScatterBelow, interpolationValue);
-  }      
+  }
 
   // The w component of inscatterRadiance has stored the Cm,r value (Cm = Sm[L0])
   // So, we must reintroduce the Mie inscatter by the proximity rule as described in the
   // paper by Bruneton and Neyret in "Angular precision" paragraph:
-    
+
   // Hermite interpolation between two values
   // This step is done because imprecision problems happen when the Sun is slightly
   // below the horizon. When this happens, we avoid the Mie scattering contribution
@@ -410,19 +410,19 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
   vec3 inscatterMie =
       inscatterRadiance.rgb * inscatterRadiance.a / max(inscatterRadiance.r, 1e-4) *
       (betaRayleigh.r / betaRayleigh);
-    
-  radiance = max(inscatterRadiance.rgb * rayleighPhase + inscatterMie * miePhase, 0.0);    
-  
+
+  radiance = max(inscatterRadiance.rgb * rayleighPhase + inscatterMie * miePhase, 0.0);
+
   // Finally we add the Lsun (all calculations are done with no Lsun so we can change it
   // on the fly with no precomputations)
   vec3 finalScatteringRadiance = radiance * sunIntensity;
   return groundHit ?  finalScatteringRadiance  :  spaceColor + finalScatteringRadiance;
 }
 
-/* 
+/*
  * Calculates the light reflected in the view direction comming from other light rays
  * integrated over the hemispehre plus the direct light (L0) from Sun.
- * Following the paper: R[L]= R[L0]+R[L*] 
+ * Following the paper: R[L]= R[L0]+R[L*]
  * The ray is x + tv, v the view direction, s is the sun direction, r and mu the position
  * and zenith cosine angle as in the paper.
  * As for all calculations in the atmosphere, the center of the coordinate system is the
@@ -430,7 +430,7 @@ vec3 inscatterRadiance(vec3 x, inout float t, inout float irradianceFactor, vec3
  * Arguments:
  * x := camera position
  * t := ray displacement variable. Here, differently from the inScatter light calculation,
- *      the position of the camera is already offset (on top of atmosphere) or inside 
+ *      the position of the camera is already offset (on top of atmosphere) or inside
  *      the atmosphere
  * v := view direction (ray's direction) (normalized)
  * s := Sun direction (normalized)
@@ -465,7 +465,7 @@ vec3 groundColor(vec3 x, float t, vec3 v, vec3 s, vec3 attenuationXtoX0, vec3 gr
     groundReflectance * mix(30.0, 1.0, smoothstep(-1.0, 0.05, dotNS)) * RLStar :
     groundReflectance * RLStar;
 
-  // Specular reflection from sun on oceans and rivers  
+  // Specular reflection from sun on oceans and rivers
   if ((waterReflectance > 0.1) && (muSun > 0.0)) {
     vec3 h = normalize(s - v);
     // Fresnell Schlick's approximation
@@ -478,11 +478,11 @@ vec3 groundColor(vec3 x, float t, vec3 v, vec3 s, vec3 attenuationXtoX0, vec3 gr
   }
 
   // Finally, we attenuate the surface Radiance from the point x0 to the camera location
-  vec3 reflectedRadiance = attenuationXtoX0 * groundRadiance;    
-  return reflectedRadiance;  
+  vec3 reflectedRadiance = attenuationXtoX0 * groundRadiance;
+  return reflectedRadiance;
 }
 
-/* 
+/*
  * Calculates the Sun color. The ray is x + tv, v the view direction, s is the sun
  * direction, r and mu the position and zenith cosine angle as in the paper. As for all
  * calculations in the atmosphere, the center of the coordinate system is the planet's
@@ -535,7 +535,7 @@ void main() {
 
   // Get the ray from camera to atm in object space
   Ray ray = calculateRayRenderableGlobe(texCoord);
-  
+
   double offset = 0.0;   // in KM
   double maxLength = 0.0;   // in KM
   bool intersect = atmosphereIntersection(ray, Rt - (ATM_EPSILON * 0.001), offset, maxLength);
@@ -561,7 +561,7 @@ void main() {
   // Data in the mainPositionTexture are written in view space (view plus camera rig)
   vec4 position = texture(mainPositionTexture, st);
 
-  // OS Eye to World coords                
+  // OS Eye to World coords
   dvec4 positionWorldCoords = viewToWorldMatrix * position;
 
   // World to Object (Normal and Position in meters)
@@ -571,7 +571,7 @@ void main() {
   // JCC (12/12/2017): AMD distance function is buggy.
   //double pixelDepth = distance(cameraPositionInObject.xyz, positionObjectsCoords.xyz);
   double pixelDepth = length(camPosObj - positionObjectsCoords);
-  
+
   // JCC (12/13/2017): Trick to remove floating error in texture.
   // We see a squared noise on planet's surface when seeing the planet from far away
   // @TODO (abock, 2021-07-01) I don't think this does anything. Remove?
@@ -581,12 +581,12 @@ void main() {
     pixelDepth += 1000.0;
     const float alpha = 1000.0;
     const float beta = 1000000.0;
-    const float x2 = 1e9; 
+    const float x2 = 1e9;
     const float diffGreek = beta - alpha;
     const float diffDist = x2 - x1;
     const float varA = diffGreek / diffDist;
     const float varB = (alpha - varA * x1);
-    pixelDepth += double(varA * dC + varB); 
+    pixelDepth += double(varA * dC + varB);
   }
 
   // All calculations are done in KM:
@@ -599,8 +599,8 @@ void main() {
     return;
   }
 
-  // Following paper nomenclature      
-  double t = offset;                  
+  // Following paper nomenclature
+  double t = offset;
 
   // Moving observer from camera location to top atmosphere. If the observer is already
   // inside the atm, offset = 0.0 and no changes at all
@@ -615,16 +615,16 @@ void main() {
   // adjust the pixelDepth for tdCalculateRayRenderableGlobe' offset so the next
   // comparison with the planet's ground make sense:
   pixelDepth -= offset;
-  
+
   dvec3 onATMPos = (modelTransformMatrix * dvec4(x * 1000.0, 1.0)).xyz;
-  float eclipseShadowATM = calcShadow(shadowDataArray, onATMPos, false);            
+  float eclipseShadowATM = calcShadow(shadowDataArray, onATMPos, false);
   float sunIntensityInscatter = sunRadiance * eclipseShadowATM;
 
   float irradianceFactor = 0.0;
 
   bool groundHit = false;
-  vec3 attenuation;     
-  
+  vec3 attenuation;
+
   vec3 inscatterColor = inscatterRadiance(x, tF, irradianceFactor, v, s, r,
     vec3(positionObjectsCoords), maxLength, pixelDepth, color, sunIntensityInscatter, mu,
     attenuation, groundHit);
@@ -639,8 +639,8 @@ void main() {
     // 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);
-  } 
-  
+  }
+
   // Final Color of ATM plus terrain:
   renderTarget = vec4(inscatterColor + atmColor, 1.0);;
 }
diff --git a/modules/atmosphere/shaders/calculation_gs.glsl b/modules/atmosphere/shaders/calculation_gs.glsl
index 16304411cc..0abafa92be 100644
--- a/modules/atmosphere/shaders/calculation_gs.glsl
+++ b/modules/atmosphere/shaders/calculation_gs.glsl
@@ -21,7 +21,7 @@
  * 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 (triangles) in;
diff --git a/modules/atmosphere/shaders/deltaE_calc_fs.glsl b/modules/atmosphere/shaders/deltaE_calc_fs.glsl
index a5e90e204c..6695d32bef 100644
--- a/modules/atmosphere/shaders/deltaE_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaE_calc_fs.glsl
@@ -27,6 +27,6 @@
 out vec4 renderTableColor;
 
 
-void main() {   
+void main() {
   renderTableColor = vec4(0.0, 0.0, 0.0, 1.0);
 }
diff --git a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
index d58ac25efe..a1e3d6c475 100644
--- a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
@@ -21,7 +21,7 @@
  * 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 "atmosphere_common.glsl"
@@ -100,7 +100,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
 
   // Now we get vec(v) and vec(s) from mu, muSun and nu:
   // Assuming:
-  //              z |theta 
+  //              z |theta
   //                |\ vec(v) ||vec(v)|| = 1
   //                | \
   //                |__\_____x
@@ -121,7 +121,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
   // 1 = sqrt(s.x*s.x + s.y*s.y + s.z*s.z)
   // s.y = sqrt(1 - s.x*s.x - s.z*s.z) = sqrt(1 - s.x*s.x - muSun*muSun)
   vec3 s = vec3(sx, sqrt(max(0.0, 1.0 - sx * sx - muSun2)), muSun);
-  
+
   // In order to integrate over 4PI, we scan the sphere using the spherical coordinates
   // previously defined
   vec3 radianceJAcc = vec3(0.0);
@@ -132,7 +132,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
     float distanceToGround = 0.0;
     float groundReflectance = 0.0;
     vec3 groundTransmittance = vec3(0.0);
-    
+
     // If the ray w can see the ground we must compute the transmittance
     // effect from the starting point x to the ground point in direction -vec(v):
     if (cosineTheta < cosHorizon) { // ray hits ground
@@ -146,7 +146,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
       //               |\ distGround
       //            r  | \  alpha
       //               |  \/
-      //               |  /  
+      //               |  /
       //               | / Rg
       //               |/
       // So cos(alpha) = ((vec(x)+vec(dg)) dot -vec(distG))/(||(vec(x)+vec(distG))|| * ||vec(distG)||)
@@ -178,7 +178,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
       float nuWV = dot(v, w);
       float phaseRayleighWV = rayleighPhaseFunction(nuWV);
       float phaseMieWV = miePhaseFunction(nuWV, mieG);
-      
+
       vec3 groundNormal = (vec3(0.0, 0.0, r) + distanceToGround * w) / Rg;
       vec3 groundIrradiance = irradianceLUT(deltaETexture, dot(groundNormal, s), Rg);
 
@@ -194,7 +194,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
       // light. We stored these values in the deltaS textures (Ray and Mie), and in order
       // to avoid problems with the high angle dependency in the phase functions, we don't
       // include the phase functions on those tables (that's why we calculate them now).
-      if (firstIteration == 1) {        
+      if (firstIteration == 1) {
         float phaseRaySW = rayleighPhaseFunction(nuSW);
         float phaseMieSW = miePhaseFunction(nuSW, mieG);
         // We can now access the values for the single InScattering in the textures deltaS textures.
@@ -204,7 +204,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
           Rt, SAMPLES_R, SAMPLES_MU_S, SAMPLES_NU).rgb;
 
         // Initial InScattering including the phase functions
-        radianceJ1 += singleRay * phaseRaySW + singleMie * phaseMieSW;        
+        radianceJ1 += singleRay * phaseRaySW + singleMie * phaseMieSW;
       }
       else {
         // On line 9 of the algorithm, the texture table deltaSR is updated, so when we
@@ -219,7 +219,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
       // Finally, we add the atmospheric scale height (See: Radiation Transfer on the
       // Atmosphere and Ocean from Thomas and Stamnes, pg 9-10.
       radianceJAcc += radianceJ1 * (betaRayleigh * exp(-(r - Rg) / HR) * phaseRayleighWV +
-        betaMieScattering * exp(-(r - Rg) / HM) * phaseMieWV) * dw;        
+        betaMieScattering * exp(-(r - Rg) / HM) * phaseMieWV) * dw;
     }
   }
 
diff --git a/modules/atmosphere/shaders/deltaS_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
index 99c25429ca..ee3ebced4c 100644
--- a/modules/atmosphere/shaders/deltaS_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
@@ -41,11 +41,11 @@ void main() {
   // First we convert the window's fragment coordinate to texel coordinates
   vec3 rst = vec3(gl_FragCoord.xy, float(layer) + 0.5) /
     vec3(ivec3(SAMPLES_MU_S * SAMPLES_NU, SAMPLES_MU, SAMPLES_R));
-  
+
   vec3 rayleighInscattering = texture(deltaSRTexture, rst).rgb;
   float mieInscattering = texture(deltaSMTexture, rst).r;
-  
+
   // We are using only the red component of the Mie scattering. See the Precomputed
   // Atmosphere Scattering paper for details about the angular precision
-  renderTarget = vec4(rayleighInscattering, mieInscattering); 
+  renderTarget = vec4(rayleighInscattering, mieInscattering);
 }
diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
index 8c7fecc422..85b7561ee5 100644
--- a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
@@ -21,7 +21,7 @@
  * 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 "atmosphere_common.glsl"
diff --git a/modules/atmosphere/shaders/inScattering_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
index afc37beb31..d5a94c2d2b 100644
--- a/modules/atmosphere/shaders/inScattering_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
@@ -45,7 +45,7 @@ uniform float r;
 uniform vec4 dhdH;
 
 
-void integrand(float r, float mu, float muSun, float nu, float y, out vec3 S_R, 
+void integrand(float r, float mu, float muSun, float nu, float y, out vec3 S_R,
                out vec3 S_M)
 {
   // The integral's integrand is the single inscattering radiance:
@@ -59,10 +59,10 @@ void integrand(float r, float mu, float muSun, float nu, float y, out vec3 S_R,
   // angular precision
   S_R = vec3(0.0);
   S_M = vec3(0.0);
-  
+
   // cosine law
   float ri = max(sqrt(r * r + y * y + 2.0 * r * mu * y), Rg);
-  
+
   // Considering the Sun as a parallel light source, thew vector s_i = s.
   // So muSun_i = (vec(y_i) dot vec(s))/r_i = ((vec(x) + vec(yi-x)) dot vec(s))/r_i
   // muSun_i = (vec(x) dot vec(s) + vec(yi-x) dot vec(s))/r_i = (r*muSun + yi*nu)/r_i
@@ -123,7 +123,7 @@ void main() {
   // parameters (uv), we unmapping mu, muSun and nu.
   float mu, muSun, nu;
   unmappingMuMuSunNu(r, dhdH, SAMPLES_MU, Rg, Rt, SAMPLES_MU_S, SAMPLES_NU, mu, muSun, nu);
-  
+
   // Here we calculate the single inScattered light. Because this is a single
   // inscattering, the light that arrives at a point y in the path from the eye to the
   // infinity (top of atmosphere or planet's ground), comes only from the light source,
@@ -135,7 +135,7 @@ void main() {
   // S[L0] = P_R*S_R[L0] + P_M*S_M[L0]
   // In order to save memory, we just store the red component of S_M[L0], and later we use
   // the proportionality rule to calcule the other components.
-  vec3 S_R; // First Order Rayleigh InScattering 
+  vec3 S_R; // First Order Rayleigh InScattering
   vec3 S_M; // First Order Mie InScattering
   inscatter(r, mu, muSun, nu, S_R, S_M);
   renderTarget1 = vec4(S_R, 1.0);
diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
index 4ea9697d02..f5a0b55a79 100644
--- a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
@@ -64,7 +64,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
   vec3 inScatteringRadiance = vec3(0.0);
   float dy = rayDistance(r, mu, Rt, Rg) / float(INSCATTER_INTEGRAL_SAMPLES);
   vec3 inScatteringRadiance_i = integrand(r, mu, muSun, nu, 0.0);
-  
+
   // 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
@@ -84,7 +84,7 @@ void main() {
   float nu = 0.0;
   // Unmapping the variables from texture texels coordinates to mapped coordinates
   unmappingMuMuSunNu(r, dhdH, SAMPLES_MU, Rg, Rt, SAMPLES_MU_S, SAMPLES_NU, mu, muSun, nu);
-  
-  // Write to texture deltaSR 
+
+  // Write to texture deltaSR
   renderTarget = vec4(inscatter(r, mu, muSun, nu), 1.0);
 }
diff --git a/modules/atmosphere/shaders/irradiance_final_fs.glsl b/modules/atmosphere/shaders/irradiance_final_fs.glsl
index f99e10cac1..0c933a45f1 100644
--- a/modules/atmosphere/shaders/irradiance_final_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_final_fs.glsl
@@ -30,9 +30,9 @@ uniform ivec2 OTHER_TEXTURES;
 uniform sampler2D deltaETexture;
 
 
-void main() {   
+void main() {
   vec2 uv = gl_FragCoord.xy / vec2(OTHER_TEXTURES);
 
   // Update texture E with E plus deltaE textures.
-  renderTableColor = texture(deltaETexture, uv);   
+  renderTableColor = texture(deltaETexture, uv);
 }
diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
index 82e3f6faca..b8f061b892 100644
--- a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
@@ -21,7 +21,7 @@
  * 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 "atmosphere_common.glsl"
@@ -98,5 +98,5 @@ void main() {
   }
 
   // Write the higher order irradiance to texture deltaE
-  renderTableColor = vec4(irradianceE, 0.0);    
+  renderTableColor = vec4(irradianceE, 0.0);
 }
diff --git a/modules/atmosphere/shaders/transmittance_calc_fs.glsl b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
index ba0a415daf..a81fa6e0a8 100644
--- a/modules/atmosphere/shaders/transmittance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
@@ -47,14 +47,14 @@ const int TRANSMITTANCE_STEPS = 500;
 // r := height of starting point vect(x)
 // mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
 // H := Thickness of atmosphere if its density were uniform (used for Rayleigh and Mie)
-float opticalDepth(float r, float mu, float H) {    
+float opticalDepth(float r, float mu, float H) {
   float r2 = r * r;
   // Is ray below horizon? The transmittance table will have only the values for
   // transmittance starting at r (x) until the light ray touches the atmosphere or the
   // ground and only for view angles v between 0 and pi/2 + eps. That's because we can
   // calculate the transmittance for angles bigger than pi/2 just inverting the ray
   // direction and starting and ending points.
-  
+
   // cosine law for triangles: y_i^2 = a^2 + b^2 - 2abcos(alpha)
   float cosZenithHorizon = -sqrt(1.0 - ((Rg * Rg) / r2));
   if (mu < cosZenithHorizon) {
@@ -67,7 +67,7 @@ float opticalDepth(float r, float mu, float H) {
   float deltaStep = b_a / float(TRANSMITTANCE_STEPS);
   // cosine law
   float y_i = exp(-(r - Rg) / H);
-  
+
   float accumulation = 0.0;
   for (int i = 1; i <= TRANSMITTANCE_STEPS; ++i) {
     float x_i = float(i) * deltaStep;
@@ -84,11 +84,11 @@ float opticalDepth(float r, float mu, float H) {
 void main() {
   float u_mu  = gl_FragCoord.x / float(TRANSMITTANCE.x);
   float u_r = gl_FragCoord.y / float(TRANSMITTANCE.y);
-  
+
   // In the paper u_r^2 = (r^2-Rg^2)/(Rt^2-Rg^2)
   // So, extracting r from u_r in the above equation:
   float r = Rg + (u_r * u_r) * (Rt - Rg);
-  
+
   // In the paper the Bruneton suggest mu = dot(v,x)/||x|| with ||v|| = 1.0
   // Later he proposes u_mu = (1-exp(-3mu-0.6))/(1-exp(-3.6))
   // But the below one is better. See Collienne.
@@ -99,9 +99,9 @@ void main() {
   if (ozoneLayerEnabled) {
     ozoneContribution = betaOzoneExtinction * 0.0000006 * opticalDepth(r, muSun, HO);
   }
-  vec3 opDepth = ozoneContribution + 
+  vec3 opDepth = ozoneContribution +
     betaMieExtinction * opticalDepth(r, muSun, HM) +
     betaRayleigh * opticalDepth(r, muSun, HR);
-  
+
   renderTableColor = vec4(exp(-opDepth), 0.0);
 }
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index 8934c3d7c4..5cc398a1c4 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -54,14 +54,7 @@ namespace {
         "This value species the size of each dimensions of the box"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo DrawLabelInfo = {
-        "DrawLabels",
-        "Draw Labels",
-        "Determines whether labels should be drawn or hidden"
-    };
-
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo =
-    {
+    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
         "The labels for the grid"
@@ -77,9 +70,6 @@ namespace {
         // [[codegen::verbatim(SizeInfo.description)]]
         std::optional<glm::vec3> size;
 
-        // [[codegen::verbatim(DrawLabelInfo.description)]]
-        std::optional<bool> drawLabels;
-
         // [[codegen::verbatim(LabelsInfo.description)]]
         std::optional<ghoul::Dictionary> labels
             [[codegen::reference("space_labelscomponent")]];
@@ -98,12 +88,10 @@ RenderableBoxGrid::RenderableBoxGrid(const ghoul::Dictionary& dictionary)
     , _color(ColorInfo, glm::vec3(0.5f), glm::vec3(0.f), glm::vec3(1.f))
     , _lineWidth(LineWidthInfo, 0.5f, 1.f, 20.f)
     , _size(SizeInfo, glm::vec3(1.f), glm::vec3(1.f), glm::vec3(100.f))
-    , _drawLabels(DrawLabelInfo, false)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _color = p.color.value_or(_color);
     _color.setViewOption(properties::Property::ViewOptions::Color);
@@ -117,12 +105,11 @@ RenderableBoxGrid::RenderableBoxGrid(const ghoul::Dictionary& dictionary)
     addProperty(_size);
 
     if (p.labels.has_value()) {
-        _drawLabels = p.drawLabels.value_or(_drawLabels);
-        addProperty(_drawLabels);
-
         _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);
     }
 }
 
@@ -215,7 +202,7 @@ void RenderableBoxGrid::render(const RenderData& data, RendererTasks&){
     global::renderEngine->openglStateCache().resetDepthState();
 
     // Draw labels
-    if (_drawLabels && _hasLabels) {
+    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);
diff --git a/modules/base/rendering/grids/renderableboxgrid.h b/modules/base/rendering/grids/renderableboxgrid.h
index cae5dc9f9b..e4a24c7df0 100644
--- a/modules/base/rendering/grids/renderableboxgrid.h
+++ b/modules/base/rendering/grids/renderableboxgrid.h
@@ -76,7 +76,6 @@ protected:
 
     // Labels
     bool _hasLabels = false;
-    properties::BoolProperty _drawLabels;
     std::unique_ptr<LabelsComponent> _labels;
 };
 
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index dc2370ee78..9f5fd7f5cb 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -81,14 +81,7 @@ namespace {
         "This value species the size of each dimensions of the grid"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo DrawLabelInfo = {
-        "DrawLabels",
-        "Draw Labels",
-        "Determines whether labels should be drawn or hidden"
-    };
-
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo =
-    {
+    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
         "The labels for the grid"
@@ -116,9 +109,6 @@ namespace {
         // [[codegen::verbatim(SizeInfo.description)]]
         std::optional<glm::vec2> size;
 
-        // [[codegen::verbatim(DrawLabelInfo.description)]]
-        std::optional<bool> drawLabels;
-
         // [[codegen::verbatim(LabelsInfo.description)]]
         std::optional<ghoul::Dictionary> labels
             [[codegen::reference("space_labelscomponent")]];
@@ -141,12 +131,10 @@ RenderableGrid::RenderableGrid(const ghoul::Dictionary& dictionary)
     , _lineWidth(LineWidthInfo, 0.5f, 1.f, 20.f)
     , _highlightLineWidth(HighlightLineWidthInfo, 0.5f, 1.f, 20.f)
     , _size(SizeInfo, glm::vec2(1.f), glm::vec2(1.f), glm::vec2(1e11f))
-    , _drawLabels(DrawLabelInfo, false)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _color = p.color.value_or(_color);
     _color.setViewOption(properties::Property::ViewOptions::Color);
@@ -178,12 +166,11 @@ RenderableGrid::RenderableGrid(const ghoul::Dictionary& dictionary)
     addProperty(_size);
 
     if (p.labels.has_value()) {
-        _drawLabels = p.drawLabels.value_or(_drawLabels);
-        addProperty(_drawLabels);
-
         _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);
     }
 }
 
@@ -314,11 +301,11 @@ void RenderableGrid::render(const RenderData& data, RendererTasks&){
     global::renderEngine->openglStateCache().resetDepthState();
 
     // Draw labels
-    if (_drawLabels && _hasLabels) {
+    if (_hasLabels && _labels->enabled()) {
         const glm::vec3 orthoUp = glm::normalize(
             glm::vec3(worldToModelTransform * glm::dvec4(up, 0.0))
         );
-         _labels->render(data, modelViewProjectionMatrix, orthoRight, orthoUp);
+        _labels->render(data, modelViewProjectionMatrix, orthoRight, orthoUp);
     }
 }
 
diff --git a/modules/base/rendering/grids/renderablegrid.h b/modules/base/rendering/grids/renderablegrid.h
index 4c30ef6d12..f9ddc2a1d9 100644
--- a/modules/base/rendering/grids/renderablegrid.h
+++ b/modules/base/rendering/grids/renderablegrid.h
@@ -85,7 +85,6 @@ protected:
 
     // Labels
     bool _hasLabels = false;
-    properties::BoolProperty _drawLabels;
     std::unique_ptr<LabelsComponent> _labels;
 };
 
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index fa4bb4060a..0026495a5b 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -71,14 +71,7 @@ namespace {
         "ring"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo DrawLabelInfo = {
-        "DrawLabels",
-        "Draw Labels",
-        "Determines whether labels should be drawn or hidden"
-    };
-
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo =
-    {
+    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
         "The labels for the grid"
@@ -100,9 +93,6 @@ namespace {
         // [[codegen::verbatim(RadiiInfo.description)]]
         std::optional<glm::vec2> radii;
 
-        // [[codegen::verbatim(DrawLabelInfo.description)]]
-        std::optional<bool> drawLabels;
-
         // [[codegen::verbatim(LabelsInfo.description)]]
         std::optional<ghoul::Dictionary> labels
             [[codegen::reference("space_labelscomponent")]];
@@ -123,12 +113,10 @@ RenderableRadialGrid::RenderableRadialGrid(const ghoul::Dictionary& dictionary)
     , _circleSegments(CircleSegmentsInfo, 36, 4, 200)
     , _lineWidth(LineWidthInfo, 0.5f, 1.f, 20.f)
     , _radii(RadiiInfo, glm::vec2(0.f, 1.f), glm::vec2(0.f), glm::vec2(20.f))
-    , _drawLabels(DrawLabelInfo, false)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _color = p.color.value_or(_color);
     _color.setViewOption(properties::Property::ViewOptions::Color);
@@ -157,12 +145,11 @@ RenderableRadialGrid::RenderableRadialGrid(const ghoul::Dictionary& dictionary)
     addProperty(_radii);
 
     if (p.labels.has_value()) {
-        _drawLabels = p.drawLabels.value_or(_drawLabels);
-        addProperty(_drawLabels);
-
         _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);
     }
 }
 
@@ -244,7 +231,7 @@ void RenderableRadialGrid::render(const RenderData& data, RendererTasks&) {
     global::renderEngine->openglStateCache().resetDepthState();
 
     // Draw labels
-    if (_drawLabels && _hasLabels) {
+    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);
diff --git a/modules/base/rendering/grids/renderableradialgrid.h b/modules/base/rendering/grids/renderableradialgrid.h
index 7f0c2288fd..88689832fd 100644
--- a/modules/base/rendering/grids/renderableradialgrid.h
+++ b/modules/base/rendering/grids/renderableradialgrid.h
@@ -90,7 +90,6 @@ protected:
 
     // Labels
     bool _hasLabels = false;
-    properties::BoolProperty _drawLabels;
     std::unique_ptr<LabelsComponent> _labels;
 };
 
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index 99bba9bd56..8b75307f6d 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -55,14 +55,7 @@ namespace {
         "This value specifies the line width of the spherical grid"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo DrawLabelInfo = {
-        "DrawLabels",
-        "Draw Labels",
-        "Determines whether labels should be drawn or hidden"
-    };
-
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo =
-    {
+    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
         "The labels for the grid"
@@ -78,9 +71,6 @@ namespace {
         // [[codegen::verbatim(LineWidthInfo.description)]]
         std::optional<float> lineWidth;
 
-        // [[codegen::verbatim(DrawLabelInfo.description)]]
-        std::optional<bool> drawLabels;
-
         // [[codegen::verbatim(LabelsInfo.description)]]
         std::optional<ghoul::Dictionary> labels
             [[codegen::reference("space_labelscomponent")]];
@@ -100,12 +90,10 @@ RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictio
     , _color(ColorInfo, glm::vec3(0.5f), glm::vec3(0.f), glm::vec3(1.f))
     , _segments(SegmentsInfo, 36, 4, 200)
     , _lineWidth(LineWidthInfo, 0.5f, 1.f, 20.f)
-    , _drawLabels(DrawLabelInfo, false)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _color = p.color.value_or(_color);
     _color.setViewOption(properties::Property::ViewOptions::Color);
@@ -127,12 +115,11 @@ RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictio
     setBoundingSphere(1.0);
 
     if (p.labels.has_value()) {
-        _drawLabels = p.drawLabels.value_or(_drawLabels);
-        addProperty(_drawLabels);
-
         _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);
     }
 }
 
@@ -232,7 +219,7 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
     global::renderEngine->openglStateCache().resetDepthState();
 
     // Draw labels
-    if (_drawLabels && _hasLabels) {
+    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);
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.h b/modules/base/rendering/grids/renderablesphericalgrid.h
index eddbfe97c7..992dd7090f 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.h
+++ b/modules/base/rendering/grids/renderablesphericalgrid.h
@@ -80,7 +80,6 @@ protected:
 
     // Labels
     bool _hasLabels = false;
-    properties::BoolProperty _drawLabels;
     std::unique_ptr<LabelsComponent> _labels;
 };
 
diff --git a/modules/base/rendering/renderablelabel.cpp b/modules/base/rendering/renderablelabel.cpp
index cda0245757..072891ee73 100644
--- a/modules/base/rendering/renderablelabel.cpp
+++ b/modules/base/rendering/renderablelabel.cpp
@@ -238,7 +238,7 @@ documentation::Documentation RenderableLabel::Documentation() {
 }
 
 RenderableLabel::RenderableLabel(const ghoul::Dictionary& dictionary)
-    : Renderable(dictionary)
+    : Renderable(dictionary, { .automaticallyUpdateRenderBin = false })
     , _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _fontSize(FontSizeInfo, 50.f, 1.f, 100.f)
@@ -260,11 +260,10 @@ RenderableLabel::RenderableLabel(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _blendMode.addOptions({
         { BlendMode::Normal, "Normal" },
-        { BlendMode::Additive, "Additive"}
+        { BlendMode::Additive, "Additive" }
     });
     _blendMode.onChange([&]() {
         switch (_blendMode) {
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 04210ff701..425564c60b 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -293,7 +293,6 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     if (p.forceRenderInvisible.has_value()) {
         _forceRenderInvisible = *p.forceRenderInvisible;
@@ -690,7 +689,7 @@ void RenderableModel::update(const UpdateData& data) {
         glm::compMax(data.modelTransform.scale)
     );
     // Set Interaction sphere size to be 10% of the bounding sphere
-    setInteractionSphere(_boundingSphere * 0.1);
+    setInteractionSphere(boundingSphere() * 0.1);
 
     if (_geometry->hasAnimation() && !_animationStart.empty()) {
         double relativeTime;
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index 7cb476c62c..26b08ce787 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -181,7 +181,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
             ));
         }
     });
@@ -199,7 +199,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
             ));
         }
      });
@@ -212,7 +212,7 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
         if (!startNode) {
             LERROR(fmt::format(
                 "Error when recomputing node line offsets for scene graph node '{}'. "
-                "Could not find start node '{}'", _parent->identifier(), _start.value()
+                "Could not find start node '{}'", parent()->identifier(), _start.value()
             ));
             return;
         }
@@ -220,7 +220,7 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
         if (!endNode) {
             LERROR(fmt::format(
                 "Error when recomputing node line offsets for scene graph node '{}'. "
-                "Could not find end node '{}'", _parent->identifier(), _end.value()
+                "Could not find end node '{}'", parent()->identifier(), _end.value()
             ));
             return;
         }
@@ -229,8 +229,10 @@ RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
             // Recompute previous offsets to relative values
             double startBs = startNode->boundingSphere();
             double endBs = endNode->boundingSphere();
-            _startOffset = startBs > 0.0 ? _startOffset / startBs : 0.0;
-            _endOffset = endBs > 0.0 ? _endOffset / startBs : 0.0;
+            _startOffset =
+                static_cast<float>(startBs > 0.0 ? _startOffset / startBs : 0.0);
+            _endOffset =
+                static_cast<float>(endBs > 0.0 ? _endOffset / startBs : 0.0);
         }
         else {
             // Recompute relative values to meters
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 647fe4818b..5fdc971f7c 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -113,7 +113,7 @@ documentation::Documentation RenderablePlane::Documentation() {
 }
 
 RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
-    : Renderable(dictionary)
+    : Renderable(dictionary, { .automaticallyUpdateRenderBin = false })
     , _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _billboard(BillboardInfo, false)
     , _mirrorBackside(MirrorBacksideInfo, false)
@@ -123,7 +123,6 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
     Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _size = p.size;
     _billboard = p.billboard.value_or(_billboard);
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 2db518a6a0..f340951674 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -162,7 +162,6 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _size = p.size;
     _segments = p.segments;
@@ -208,7 +207,6 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     addProperty(_disableFadeInDistance);
 
     setBoundingSphere(_size);
-    setRenderBinFromOpacity();
 }
 
 bool RenderableSphere::isReady() const {
diff --git a/modules/base/rendering/renderabletimevaryingsphere.cpp b/modules/base/rendering/renderabletimevaryingsphere.cpp
index 0a0d488380..3cfd71cac7 100644
--- a/modules/base/rendering/renderabletimevaryingsphere.cpp
+++ b/modules/base/rendering/renderabletimevaryingsphere.cpp
@@ -164,7 +164,6 @@ RenderableTimeVaryingSphere::RenderableTimeVaryingSphere(
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _size = p.size;
     _segments = p.segments;
@@ -208,7 +207,6 @@ RenderableTimeVaryingSphere::RenderableTimeVaryingSphere(
     }
 
     setBoundingSphere(_size);
-    setRenderBinFromOpacity();
 }
 
 bool RenderableTimeVaryingSphere::isReady() const {
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 6dd70af5bb..92911e76eb 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -433,7 +433,7 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
     );
     const double distance = glm::distance(trailPosWorld, data.camera.eyePositionVec3());
 
-    if (distance > _boundingSphere * DISTANCE_CULLING_RADII) {
+    if (distance > boundingSphere() * DISTANCE_CULLING_RADII) {
         return;
     }
 
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index 68120b0427..d6141007b9 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -208,23 +208,23 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
             _totalSampleInterval = _sampleInterval / _timeStampSubsamplingFactor;
 
             // Cap _numberOfVertices in order to prevent overflow and extreme performance
-            // degredation/RAM usage 
+            // degredation/RAM usage
             _numberOfVertices = std::min(
                 static_cast<unsigned int>(timespan / _totalSampleInterval),
                 maxNumberOfVertices
             );
 
             // We need to recalcuate the _totalSampleInterval if _numberOfVertices eqals
-            // maxNumberOfVertices. If we don't do this the position for each vertex 
+            // maxNumberOfVertices. If we don't do this the position for each vertex
             // will not be correct for the number of vertices we are doing along the trail.
-            _totalSampleInterval = (_numberOfVertices == maxNumberOfVertices) ? 
+            _totalSampleInterval = (_numberOfVertices == maxNumberOfVertices) ?
                 (timespan / _numberOfVertices) : _totalSampleInterval;
 
             // Make space for the vertices
             _vertexArray.clear();
             _vertexArray.resize(_numberOfVertices);
         }
-        
+
         // Calculate sweeping range for this iteration
         unsigned int startIndex = _sweepIteration * _sweepChunkSize;
         unsigned int nextIndex = (_sweepIteration + 1) * _sweepChunkSize;
@@ -249,12 +249,12 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
             _sweepIteration = 0;
             setBoundingSphere(glm::distance(_maxVertex, _minVertex) / 2.f);
         }
-        else { 
-            // Early return as we don't need to render if we are still 
+        else {
+            // Early return as we don't need to render if we are still
             // doing full sweep calculations
             return;
         }
-        
+
         // Upload vertices to the GPU
         glBindVertexArray(_primaryRenderInformation._vaoID);
         glBindBuffer(GL_ARRAY_BUFFER, _primaryRenderInformation._vBufferID);
diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h
index 704e072dae..018b5f6b58 100644
--- a/modules/base/rendering/renderabletrailtrajectory.h
+++ b/modules/base/rendering/renderabletrailtrajectory.h
@@ -60,7 +60,7 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    
+
     /// Reset some variables to default state
     void reset();
 
@@ -95,7 +95,7 @@ private:
     /// Tracks sweep iteration, is used to calculate which vertices to work on per frame
     int _sweepIteration = 0;
 
-    /// How many points do we need to compute given the distance between the 
+    /// How many points do we need to compute given the distance between the
     /// start and end date and the desired sample interval
     unsigned int _numberOfVertices = 0;
 
diff --git a/modules/base/shaders/model_fs.glsl b/modules/base/shaders/model_fs.glsl
index 688c680e81..5ee2771f32 100644
--- a/modules/base/shaders/model_fs.glsl
+++ b/modules/base/shaders/model_fs.glsl
@@ -103,7 +103,7 @@ Fragment getFragment() {
     // Some of these values could be passed in as uniforms
     const vec3 lightColorAmbient = vec3(1.0);
     const vec3 lightColor = vec3(1.0);
-        
+
     vec3 n;
     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 6bb6a853d2..6e863b322c 100644
--- a/modules/base/shaders/model_vs.glsl
+++ b/modules/base/shaders/model_vs.glsl
@@ -52,7 +52,7 @@ void main() {
   gl_Position = positionScreenSpace;
   vs_st = in_st;
   vs_screenSpaceDepth = positionScreenSpace.w;
-    
+
   vs_normalViewSpace = normalize(mat3(normalTransform) * (mat3(meshNormalTransform) * in_normal));
 
 	// TBN matrix for normal mapping
diff --git a/modules/base/shaders/renderabletrail_apple_fs.glsl b/modules/base/shaders/renderabletrail_apple_fs.glsl
index a0fe0af4a2..7d7d61cbb4 100644
--- a/modules/base/shaders/renderabletrail_apple_fs.glsl
+++ b/modules/base/shaders/renderabletrail_apple_fs.glsl
@@ -32,7 +32,7 @@ uniform vec3 color;
 uniform int renderPhase;
 uniform float opacity = 1.0;
 
-// Fragile! Keep in sync with RenderableTrail::render::RenderPhase 
+// Fragile! Keep in sync with RenderableTrail::render::RenderPhase
 #define RenderPhaseLines 0
 #define RenderPhasePoints 1
 
@@ -49,7 +49,7 @@ Fragment getFragment() {
     // Use the length of the vector (dot(circCoord, circCoord)) as factor in the
     // smoothstep to gradually decrease the alpha on the edges of the point
     vec2 circCoord = 2.0 * gl_PointCoord - 1.0;
-    //float circleClipping = 1.0 - smoothstep(1.0 - Delta, 1.0, dot(circCoord, circCoord));        
+    //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) {
diff --git a/modules/base/shaders/renderabletrail_apple_vs.glsl b/modules/base/shaders/renderabletrail_apple_vs.glsl
index 93bd48220d..75baaa5449 100644
--- a/modules/base/shaders/renderabletrail_apple_vs.glsl
+++ b/modules/base/shaders/renderabletrail_apple_vs.glsl
@@ -67,7 +67,7 @@ void main() {
       id = 1.0 - id;
     }
 
-    fade = clamp(id * lineFade, 0.0, 1.0); 
+    fade = clamp(id * lineFade, 0.0, 1.0);
   }
   else {
     fade = 1.0;
@@ -76,8 +76,8 @@ void main() {
   vs_gPosition = vec4(modelViewTransform * dvec4(in_point_position, 1));
   vec4 vs_positionClipSpace = projectionTransform * vs_gPosition;
   vs_positionDepth = vs_positionClipSpace.w;
-  
-  gl_PointSize = (stride == 1 || int(modId) % stride == 0) ? 
+
+  gl_PointSize = (stride == 1 || int(modId) % stride == 0) ?
                   float(pointSize) : float(pointSize) / 2;
   gl_Position  = z_normalization(vs_positionClipSpace);
 }
diff --git a/modules/base/shaders/renderabletrail_fs.glsl b/modules/base/shaders/renderabletrail_fs.glsl
index c68fab1acb..7d0ac545ef 100644
--- a/modules/base/shaders/renderabletrail_fs.glsl
+++ b/modules/base/shaders/renderabletrail_fs.glsl
@@ -35,7 +35,7 @@ uniform float opacity = 1.0;
 uniform float lineWidth;
 uniform vec4 viewport;
 
-// Fragile! Keep in sync with RenderableTrail::render::RenderPhase 
+// Fragile! Keep in sync with RenderableTrail::render::RenderPhase
 const int RenderPhaseLines = 0;
 const int RenderPhasePoints = 1;
 
@@ -52,7 +52,7 @@ Fragment getFragment() {
     // Use the length of the vector (dot(circCoord, circCoord)) as factor in the
     // smoothstep to gradually decrease the alpha on the edges of the point
     vec2 circCoord = 2.0 * gl_PointCoord - 1.0;
-    //float circleClipping = 1.0 - smoothstep(1.0 - Delta, 1.0, dot(circCoord, circCoord));        
+    //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) {
@@ -71,7 +71,7 @@ Fragment getFragment() {
   double distanceCenter = length(mathLine - xy);
   double dLW = double(lineWidth);
   const float blendFactor = 20.0;
-  
+
   if (distanceCenter > dLW) {
     frag.color.a = 0.0;
   }
@@ -80,7 +80,7 @@ Fragment getFragment() {
   }
 
   frag.gPosition = vs_gPosition;
-  
+
   // There is no normal here
   frag.gNormal = vec4(0.0, 0.0, -1.0, 1.0);
 
diff --git a/modules/base/shaders/renderabletrail_vs.glsl b/modules/base/shaders/renderabletrail_vs.glsl
index 387478cd55..1b5f818a53 100644
--- a/modules/base/shaders/renderabletrail_vs.glsl
+++ b/modules/base/shaders/renderabletrail_vs.glsl
@@ -68,7 +68,7 @@ void main() {
       id = 1.0 - id;
     }
 
-    fade = clamp(id * lineFade, 0.0, 1.0); 
+    fade = clamp(id * lineFade, 0.0, 1.0);
   }
   else {
     fade = 1.0;
@@ -78,8 +78,8 @@ void main() {
   vec4 vs_positionClipSpace = projectionTransform * vs_gPosition;
   vec4 vs_positionNDC = vs_positionClipSpace / vs_positionClipSpace.w;
   vs_positionDepth = vs_positionClipSpace.w;
-  
-  gl_PointSize = (stride == 1 || int(modId) % stride == 0) ? 
+
+  gl_PointSize = (stride == 1 || int(modId) % stride == 0) ?
                   float(pointSize) : float(pointSize) / 2;
   gl_Position  = z_normalization(vs_positionClipSpace);
 
diff --git a/modules/debugging/debuggingmodule_lua.inl b/modules/debugging/debuggingmodule_lua.inl
index febff86860..c8951ae0fb 100644
--- a/modules/debugging/debuggingmodule_lua.inl
+++ b/modules/debugging/debuggingmodule_lua.inl
@@ -22,6 +22,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+#include <openspace/scene/scene.h>
+
 namespace {
 
 constexpr const char RenderedPathIdentifier[] = "CurrentCameraPath";
@@ -31,17 +33,6 @@ constexpr const char DebuggingGuiPath[] = "/Debugging";
 constexpr glm::vec3 PathColor = glm::vec3(1.0, 1.0, 0.0);
 constexpr glm::vec3 OrientationLineColor = glm::vec3(0.0, 1.0, 1.0);
 
-// Conver the input string to a format that is valid as an identifier
-std::string makeIdentifier(std::string s) {
-    std::replace(s.begin(), s.end(), ' ', '_');
-    std::replace(s.begin(), s.end(), '.', '-');
-    // Remove quotes and apostrophe, since they cause problems
-    // when a string is translated to a script call
-    s.erase(remove(s.begin(), s.end(), '\"'), s.end());
-    s.erase(remove(s.begin(), s.end(), '\''), s.end());
-    return s;
-}
-
 /**
  * Render the current camera path from the path navigation system. The first optional
  * argument is the number of samples to take along the path (defaults to 100). If a second
@@ -190,7 +181,7 @@ std::string makeIdentifier(std::string s) {
     // previously rendered ones
     std::string addParentScript = fmt::format(
         "if openspace.hasSceneGraphNode('{0}') then "
-        "openspace.removeSceneGraphNode('{0}') "
+            "openspace.removeSceneGraphNode('{0}') "
         "end "
         "openspace.addSceneGraphNode({{ Identifier = '{0}' }})",
         RenderedPointsIdentifier
@@ -215,23 +206,23 @@ std::string makeIdentifier(std::string s) {
             "Identifier = 'ControlPoint_" + std::to_string(i) + "',"
             "Parent = '" + RenderedPointsIdentifier + "',"
             "Transform = { "
-            "Translation = {"
-            "Type = 'StaticTranslation',"
-            "Position = " + ghoul::to_string(points[i]) + ""
-            "},"
+                "Translation = {"
+                    "Type = 'StaticTranslation',"
+                    "Position = " + ghoul::to_string(points[i]) + ""
+                "},"
             "},"
             "Renderable = {"
-            "Type = 'RenderableSphere',"
-            "Enabled = true,"
-            "Segments = 30,"
-            "Size = " + std::to_string(radius) + ","
-            "Texture = " + colorTexturePath + ""
+                "Type = 'RenderableSphere',"
+                "Enabled = true,"
+                "Segments = 30,"
+                "Size = " + std::to_string(radius) + ","
+                "Texture = " + colorTexturePath + ""
             "},"
             "GUI = {"
-            "Name = 'Control Point " + std::to_string(i) + "',"
-            "Path = '" + guiPath + "'"
+                "Name = 'Control Point " + std::to_string(i) + "',"
+                "Path = '" + guiPath + "'"
             "}"
-            "}";
+        "}";
 
         global::scriptEngine->queueScript(
             fmt::format("openspace.addSceneGraphNode({})", node),
@@ -280,21 +271,21 @@ std::string makeIdentifier(std::string s) {
         "Identifier = '" + identifier + "',"
         "Parent = '" + nodeIdentifier + "',"
         "Transform = { "
-        "Scale = {"
-        "Type = 'StaticScale',"
-        "Scale = " + std::to_string(*scale) + ""
-        "}"
+            "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 }"
+            "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'"
+            "Name = '" + identifier + "',"
+            "Path = '" + DebuggingGuiPath + "/Coordiante Systems'"
         "}"
     "}";
 
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
index 561f7b9319..1d91a51c76 100644
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
+++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
@@ -106,14 +106,7 @@ namespace {
         "Enables/Disables the drawing of the astronomical objects"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo DrawLabelInfo = {
-        "DrawLabels",
-        "Draw Labels",
-        "Determines whether labels should be drawn or hidden"
-    };
-
-    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo =
-    {
+    static const openspace::properties::PropertyOwner::PropertyOwnerInfo LabelsInfo = {
         "Labels",
         "Labels",
         "The labels for the astronomical objects"
@@ -251,9 +244,6 @@ namespace {
         // The number of sides for the polygon used to represent the astronomical object
         std::optional<int> polygonSides;
 
-        // [[codegen::verbatim(DrawLabelInfo.description)]]
-        std::optional<bool> drawLabels;
-
         // [[codegen::verbatim(LabelsInfo.description)]]
         std::optional<ghoul::Dictionary> labels
             [[codegen::reference("space_labelscomponent")]];
@@ -308,7 +298,6 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
     , _pointColor(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _spriteTexturePath(SpriteTextureInfo)
     , _drawElements(DrawElementsInfo, true)
-    , _drawLabels(DrawLabelInfo, false)
     , _pixelSizeControl(PixelSizeControlInfo, false)
     , _colorOption(ColorOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _optionColorRangeData(OptionColorRangeInfo, glm::vec2(0.f))
@@ -441,12 +430,11 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
     _hasPolygon = p.polygonSides.has_value();
 
     if (p.labels.has_value()) {
-        _drawLabels = p.drawLabels.value_or(_drawLabels);
-        addProperty(_drawLabels);
-
         _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);
@@ -719,7 +707,7 @@ void RenderableBillboardsCloud::render(const RenderData& data, RendererTasks&) {
         renderBillboards(data, modelMatrix, orthoRight, orthoUp, fadeInVar);
     }
 
-    if (_drawLabels && _hasLabels) {
+    if (_hasLabels) {
         _labels->render(data, modelViewProjectionMatrix, orthoRight, orthoUp, fadeInVar);
     }
 }
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.h b/modules/digitaluniverse/rendering/renderablebillboardscloud.h
index 08974cf8db..142275c5fb 100644
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.h
+++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.h
@@ -98,7 +98,6 @@ private:
     properties::Vec3Property _pointColor;
     properties::StringProperty _spriteTexturePath;
     properties::BoolProperty _drawElements;
-    properties::BoolProperty _drawLabels;
     properties::BoolProperty _pixelSizeControl;
     properties::OptionProperty _colorOption;
     properties::Vec2Property _optionColorRangeData;
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index ae243e0087..7ea15ca523 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -189,7 +189,6 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _speckFile = absPath(p.file).string();
     _hasSpeckFile = true;
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index 580eadb530..c343c56649 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -242,6 +242,8 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
         _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);
diff --git a/modules/digitaluniverse/rendering/renderablepoints.cpp b/modules/digitaluniverse/rendering/renderablepoints.cpp
index 62db7cda17..9558e33956 100644
--- a/modules/digitaluniverse/rendering/renderablepoints.cpp
+++ b/modules/digitaluniverse/rendering/renderablepoints.cpp
@@ -130,7 +130,6 @@ RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _speckFile = absPath(p.file);
 
diff --git a/modules/digitaluniverse/shaders/billboard_fs.glsl b/modules/digitaluniverse/shaders/billboard_fs.glsl
index bbd3e78a87..f6ce480f6a 100644
--- a/modules/digitaluniverse/shaders/billboard_fs.glsl
+++ b/modules/digitaluniverse/shaders/billboard_fs.glsl
@@ -48,7 +48,7 @@ Fragment getFragment() {
   }
 
   vec4 fullColor = textureColor;
-    
+
   if (hasColorMap && useColorMap) {
     fullColor *= gs_colorMap;
   }
diff --git a/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl b/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl
index 4155d8761a..764fb2fbe6 100644
--- a/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl
+++ b/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl
@@ -34,7 +34,7 @@ const float PI = 3.1415926;
 
 void main() {
   vec4 v0 = gl_in[0].gl_Position;
-    
+
   for (int i = sides; i > 0; --i) {
     // Angle between each side in radians
     float ang = 2.0 * PI / float(sides) * i;
diff --git a/modules/digitaluniverse/shaders/dumesh_fs.glsl b/modules/digitaluniverse/shaders/dumesh_fs.glsl
index 9b405e6264..e037698615 100644
--- a/modules/digitaluniverse/shaders/dumesh_fs.glsl
+++ b/modules/digitaluniverse/shaders/dumesh_fs.glsl
@@ -44,6 +44,6 @@ Fragment getFragment() {
   // JCC: Need to change the position to camera space
   frag.gPosition = vs_positionViewSpace;
   frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
-    
+
   return frag;
 }
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index a9d196eba3..ecad68a0f0 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -154,13 +154,6 @@ glm::dmat3 computeSystemRotation(glm::dvec3 starPosition) {
     );
 }
 
-std::string createIdentifier(std::string name) {
-    std::replace(name.begin(), name.end(), ' ', '_');
-    std::replace(name.begin(), name.end(), '.', '-');
-    sanitizeNameString(name);
-    return name;
-}
-
 void sanitizeNameString(std::string& s) {
     // We want to avoid quotes and apostrophes in names, since they cause problems
     // when a string is translated to a script call
diff --git a/modules/exoplanets/exoplanetshelper.h b/modules/exoplanets/exoplanetshelper.h
index 2075d68a92..d4e9c9ca0f 100644
--- a/modules/exoplanets/exoplanetshelper.h
+++ b/modules/exoplanets/exoplanetshelper.h
@@ -108,9 +108,6 @@ glm::dmat4 computeOrbitPlaneRotationMatrix(float i, float bigom = 180.f,
 // so that x is pointing from star to the sun.
 glm::dmat3 computeSystemRotation(glm::dvec3 starPosition);
 
-// Create an identifier without whitespaces
-std::string createIdentifier(std::string name);
-
 void sanitizeNameString(std::string& s);
 
 } // namespace openspace::exoplanets
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index d7c9aa84cd..68c78ca25f 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -33,7 +33,6 @@
 #include <openspace/query/query.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
-#include <openspace/scene/scene.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/distanceconstants.h>
 #include <openspace/util/factorymanager.h>
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 539210c10f..8faa22754f 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -22,6 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+#include <openspace/scene/scene.h>
 #include <algorithm>
 #include <string>
 #include <string_view>
@@ -123,7 +124,7 @@ void createExoplanetSystem(const std::string& starName) {
     using namespace openspace;
     using namespace exoplanets;
 
-    const std::string starIdentifier = createIdentifier(starName);
+    const std::string starIdentifier = makeIdentifier(starName);
 
     std::string sanitizedStarName = starName;
     sanitizeNameString(sanitizedStarName);
@@ -286,7 +287,7 @@ void createExoplanetSystem(const std::string& starName) {
         double semiMajorAxisInMeter = planet.a * distanceconstants::AstronomicalUnit;
         double semiMajorAxisInKm = semiMajorAxisInMeter * 0.001;
 
-        const std::string planetIdentifier = createIdentifier(planetName);
+        const std::string planetIdentifier = makeIdentifier(planetName);
 
         const std::string planetKeplerTranslation = "{"
             "Type = 'KeplerTranslation',"
@@ -631,7 +632,7 @@ std::vector<std::string> hostStarsWithSufficientData() {
 [[codegen::luawrap]] void removeExoplanetSystem(std::string starName) {
     using namespace openspace;
     using namespace exoplanets;
-    const std::string starIdentifier = createIdentifier(std::move(starName));
+    const std::string starIdentifier = makeIdentifier(std::move(starName));
     global::scriptEngine->queueScript(
         "openspace.removeSceneGraphNode('" + starIdentifier + "');",
         scripting::ScriptEngine::RemoteScripting::Yes
diff --git a/modules/fieldlines/shaders/fieldline_fs.glsl b/modules/fieldlines/shaders/fieldline_fs.glsl
index 505f748f5c..e7c42dd82a 100644
--- a/modules/fieldlines/shaders/fieldline_fs.glsl
+++ b/modules/fieldlines/shaders/fieldline_fs.glsl
@@ -45,7 +45,7 @@ Fragment getFragment() {
   }
 
   frag.depth = pscDepth(gs_position);
-      
+
   // G-Buffer
   frag.gPosition  = vec4(0.0);//vs_gPosition;
   // There is no normal here
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index d98c314214..990feb5693 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -577,7 +577,7 @@ bool RenderableFieldlinesSequence::prepareForOsflsStreaming() {
     _states.push_back(newState);
     _nStates = _startTimes.size();
     if (_nStates == 1) {
-        // loading dynamicaly is not nessesary if only having one set in the sequence 
+        // loading dynamicaly is not nessesary if only having one set in the sequence
         _loadingStatesDynamically = false;
     }
     _activeStateIndex = 0;
@@ -1046,7 +1046,7 @@ void RenderableFieldlinesSequence::update(const UpdateData& data) {
     const double currentTime = data.time.j2000Seconds();
     const bool isInInterval = (currentTime >= _startTimes[0]) &&
                               (currentTime < _sequenceEndTime);
-    
+
     // Check if current time in OpenSpace is within sequence interval
     if (isInInterval) {
         const size_t nextIdx = _activeTriggerTimeIndex + 1;
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
index 64962b8077..f30c8c75ad 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
@@ -108,7 +108,7 @@ private:
     // line segments
     bool _shouldUpdateMaskingBuffer = false;
     // note Elon: rework the case of only one state
-    // hasBeenUpdated only gets sets once, first iteration of update function, to 
+    // hasBeenUpdated only gets sets once, first iteration of update function, to
     // guarantee the vertext position buffer to be initialized.
     bool _hasBeenUpdated = false;
 
diff --git a/modules/gaia/scripts/filtering.lua b/modules/gaia/scripts/filtering.lua
index 896f6c2d24..f070583daf 100644
--- a/modules/gaia/scripts/filtering.lua
+++ b/modules/gaia/scripts/filtering.lua
@@ -79,7 +79,7 @@ openspace.gaia.addClippingSphere = function (name, radius)
         Transform = {
             Scale = {
                 Type = "StaticScale",
-                Scale = radius * kilo_parsec_in_meter 
+                Scale = radius * kilo_parsec_in_meter
             }
         },
         Renderable = {
diff --git a/modules/gaia/shaders/gaia_billboard_fs.glsl b/modules/gaia/shaders/gaia_billboard_fs.glsl
index dcd4d84ab0..ffb76f0781 100644
--- a/modules/gaia/shaders/gaia_billboard_fs.glsl
+++ b/modules/gaia/shaders/gaia_billboard_fs.glsl
@@ -44,7 +44,7 @@ uniform int renderOption;
 // Keep in sync with gaiaoptions.h:RenderOption enum
 const int RENDEROPTION_STATIC = 0;
 const int RENDEROPTION_COLOR = 1;
-const int RENDEROPTION_MOTION = 2; 
+const int RENDEROPTION_MOTION = 2;
 const float ONE_PARSEC = 3.08567758e16; // 1 Parsec
 const float FLT_MAX  = 3.402823466e38; // Max float constant in GLSL
 const float LUM_LOWER_CAP = 0.01;
diff --git a/modules/gaia/shaders/gaia_billboard_ge.glsl b/modules/gaia/shaders/gaia_billboard_ge.glsl
index 833b6df677..4d3df59446 100644
--- a/modules/gaia/shaders/gaia_billboard_ge.glsl
+++ b/modules/gaia/shaders/gaia_billboard_ge.glsl
@@ -34,7 +34,7 @@ in float vs_cameraDistFromSun[];
 
 layout(triangle_strip, max_vertices = 4) out;
 out vec2 ge_brightness;
-out vec4 ge_gPosition;               
+out vec4 ge_gPosition;
 out vec2 texCoord;
 out float ge_starDistFromSun;
 out float ge_cameraDistFromSun;
@@ -54,15 +54,15 @@ uniform float magnitudeBoost;
 // Keep in sync with gaiaoptions.h:RenderOption enum
 const int RENDEROPTION_STATIC = 0;
 const int RENDEROPTION_COLOR = 1;
-const int RENDEROPTION_MOTION = 2; 
+const int RENDEROPTION_MOTION = 2;
 const float EPS = 1e-5;
 
 
 const vec2 corners[4] = vec2[4](
-  vec2(0.0, 1.0), 
-  vec2(0.0, 0.0), 
-  vec2(1.0, 1.0), 
-  vec2(1.0, 0.0) 
+  vec2(0.0, 1.0),
+  vec2(0.0, 0.0),
+  vec2(1.0, 1.0),
+  vec2(1.0, 0.0)
 );
 
 
@@ -86,7 +86,7 @@ void main() {
     // Big positive magnitude => Dwarfs
     float absoluteMagnitude = vs_brightness[0].x;
     float normalizedMagnitude = (absoluteMagnitude - 20) / -1; // (-15 - 20);
-    
+
     // TODO: A linear scale is prabably not the best!
     initStarSize += normalizedMagnitude * (magnitudeBoost / 50);
   }
@@ -102,9 +102,9 @@ void main() {
   if (length(position) < EPS || distThreshold <= 0) {
     return;
   }
-  
+
   vec4 centerWorldPos = vs_gPosition[0];
-  
+
   dvec3 cameraNormal = normalize(cameraPos - dvec3(centerWorldPos.xyz));
   dvec3 newRight = normalize(cross(cameraLookUp, cameraNormal));
   dvec3 newUp = cross(cameraNormal, newRight);
@@ -122,7 +122,7 @@ void main() {
     gl_Position.z = 0.0;
     texCoord = corners[i];
     ge_gPosition  = viewPosition;
-    
+
     EmitVertex();
   }
 
diff --git a/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl b/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
index 7ff547f3ec..763b0d5122 100644
--- a/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
+++ b/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
@@ -21,7 +21,7 @@
  * 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"
 #include "floatoperations.glsl"
 
@@ -41,7 +41,7 @@ uniform int renderOption;
 // Keep in sync with gaiaoptions.h:RenderOption enum
 const int RENDEROPTION_STATIC = 0;
 const int RENDEROPTION_COLOR = 1;
-const int RENDEROPTION_MOTION = 2; 
+const int RENDEROPTION_MOTION = 2;
 const float ONE_PARSEC = 3.08567758e16; // 1 Parsec
 const float DEFAULT_DEPTH = 3.08567758e19; // 1000 Pc
 const float LUM_LOWER_CAP = 0.01;
@@ -114,7 +114,7 @@ Fragment getFragment() {
 
   Fragment frag;
   frag.color = vec4(color, textureColor.a);;
-  // Place stars at back to begin with. 
+  // Place stars at back to begin with.
   frag.depth = DEFAULT_DEPTH;
   frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
   frag.blend = BLEND_MODE_NORMAL;
diff --git a/modules/gaia/shaders/gaia_point_fs.glsl b/modules/gaia/shaders/gaia_point_fs.glsl
index 9e271f44f5..c7f998c063 100644
--- a/modules/gaia/shaders/gaia_point_fs.glsl
+++ b/modules/gaia/shaders/gaia_point_fs.glsl
@@ -42,7 +42,7 @@ uniform float viewScaling;
 // Keep in sync with gaiaoptions.h:RenderOption enum
 const int RENDEROPTION_STATIC = 0;
 const int RENDEROPTION_COLOR = 1;
-const int RENDEROPTION_MOTION = 2; 
+const int RENDEROPTION_MOTION = 2;
 const float ONE_PARSEC = 3.08567758e16; // 1 Parsec
 const float LUM_LOWER_CAP = 0.01;
 
diff --git a/modules/gaia/shaders/gaia_ssbo_vs.glsl b/modules/gaia/shaders/gaia_ssbo_vs.glsl
index fc1d70048b..b379f956df 100644
--- a/modules/gaia/shaders/gaia_ssbo_vs.glsl
+++ b/modules/gaia/shaders/gaia_ssbo_vs.glsl
@@ -26,11 +26,11 @@
 
 #include "floatoperations.glsl"
 
-layout (std430) buffer ssbo_idx_data { 
+layout (std430) buffer ssbo_idx_data {
   int starsPerChunk[];
 };
 
-layout (std430) buffer ssbo_comb_data { 
+layout (std430) buffer ssbo_comb_data {
   float allData[];
 };
 
@@ -42,7 +42,7 @@ out float vs_cameraDistFromSun;
 uniform dmat4 model;
 uniform dmat4 view;
 uniform dmat4 projection;
-uniform float time; 
+uniform float time;
 uniform int renderOption;
 uniform int maxStarsPerNode;
 uniform int valuesPerStar;
@@ -57,7 +57,7 @@ uniform vec2 distThreshold;
 // Keep in sync with gaiaoptions.h:RenderOption enum
 const int RENDEROPTION_STATIC = 0;
 const int RENDEROPTION_COLOR = 1;
-const int RENDEROPTION_MOTION = 2; 
+const int RENDEROPTION_MOTION = 2;
 const float EPS = 1e-5;
 const float Parsec = 3.0856776e16;
 
@@ -88,7 +88,7 @@ void main() {
   int chunkId = findChunkId(0, nChunksToRender - 1, gl_VertexID);
   // Fail safe - this should never happen!
   if (chunkId == -1) {
-    vs_gPosition = vec4(0.0);    
+    vs_gPosition = vec4(0.0);
     gl_Position = vec4(0.0);
     return;
   }
@@ -97,28 +97,28 @@ void main() {
   int nStarsInChunk = starsPerChunk[chunkId + 1] - starsPerChunk[chunkId]; // Stars in current chunk.
   // Remove possible duplicates
   if (nStarsInChunk <= 0) {
-    vs_gPosition = vec4(0.0);    
+    vs_gPosition = vec4(0.0);
     gl_Position = vec4(0.0);
     return;
   }
-  
+
   int startOfPos = firstStarInChunk + placeInChunk * 3;
   vec3 in_position = vec3(allData[startOfPos], allData[startOfPos + 1], allData[startOfPos + 2]);
   vec2 in_brightness = vec2(0.0);
   vec3 in_velocity = vec3(0.0);
 
   // Check if we should filter this star by position
-  if ((abs(posXThreshold.x) > EPS && in_position.x < posXThreshold.x) || 
-      (abs(posXThreshold.y) > EPS && in_position.x > posXThreshold.y) || 
-      (abs(posYThreshold.x) > EPS && in_position.y < posYThreshold.x) || 
-      (abs(posYThreshold.y) > EPS && in_position.y > posYThreshold.y) || 
-      (abs(posZThreshold.x) > EPS && in_position.z < posZThreshold.x) || 
-      (abs(posZThreshold.y) > EPS && in_position.z > posZThreshold.y) || 
-      (abs(distThreshold.x - distThreshold.y) < EPS 
+  if ((abs(posXThreshold.x) > EPS && in_position.x < posXThreshold.x) ||
+      (abs(posXThreshold.y) > EPS && in_position.x > posXThreshold.y) ||
+      (abs(posYThreshold.x) > EPS && in_position.y < posYThreshold.x) ||
+      (abs(posYThreshold.y) > EPS && in_position.y > posYThreshold.y) ||
+      (abs(posZThreshold.x) > EPS && in_position.z < posZThreshold.x) ||
+      (abs(posZThreshold.y) > EPS && in_position.z > posZThreshold.y) ||
+      (abs(distThreshold.x - distThreshold.y) < EPS
       && abs(length(in_position) - distThreshold.y) < EPS))
   {
     // Discard star in geometry shader
-    vs_gPosition = vec4(0.0);    
+    vs_gPosition = vec4(0.0);
     gl_Position = vec4(0.0);
     return;
   }
@@ -130,14 +130,14 @@ 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.x - 20.0f) > EPS && in_brightness.x < gMagThreshold.x) ||
         (abs(gMagThreshold.y - 20.0f) > 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.x) > EPS && in_brightness.y < bpRpThreshold.x) ||
         (abs(bpRpThreshold.y) > EPS && in_brightness.y > bpRpThreshold.y))
     {
       // Discard star in geometry shader
-      vs_gPosition = vec4(0.0);    
+      vs_gPosition = vec4(0.0);
       gl_Position = vec4(0.0);
       return;
     }
@@ -145,7 +145,7 @@ void main() {
     if (renderOption == RENDEROPTION_MOTION) {
       int startOfVel = firstStarInChunk + nStarsInChunk * 5 + placeInChunk * 3;
       in_velocity = vec3(allData[startOfVel], allData[startOfVel + 1], allData[startOfVel + 2]);
-    } 
+    }
   }
   vs_brightness = in_brightness;
 
@@ -157,12 +157,12 @@ void main() {
 
   // Thres moving stars by their new position
   float distPosition = length(objectPosition.xyz / (1000.0 * Parsec));
-  if ((abs(distThreshold.x - distThreshold.y) > EPS && 
-      ((abs(distThreshold.x) > EPS && distPosition < distThreshold.x) || 
+  if ((abs(distThreshold.x - distThreshold.y) > EPS &&
+      ((abs(distThreshold.x) > EPS && distPosition < distThreshold.x) ||
       (abs(distThreshold.y) > EPS && distPosition > distThreshold.y))))
   {
     // Discard star in geometry shader
-    vs_gPosition = vec4(0.0);    
+    vs_gPosition = vec4(0.0);
     gl_Position = vec4(0.0);
     return;
   }
@@ -177,11 +177,11 @@ 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){
-    vs_gPosition = vec4(model * objectPosition);    
+    vs_gPosition = vec4(model * objectPosition);
     gl_Position = vec4(projection * viewPosition);
   }
   else {
-    vs_gPosition = vec4(0.0);    
+    vs_gPosition = vec4(0.0);
     gl_Position = vec4(0.0);
   }
 }
diff --git a/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl b/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
index 720ed9911a..208b247c2b 100644
--- a/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
@@ -33,9 +33,9 @@ const float DEFAULT_DEPTH = 3.08567758e19; // 1000 Pc
 
 Fragment getFragment() {
   vec4 color = vec4(0.0);
-    
+
   // BILLBOARDS
-  // Sample color. Tonemapping done in first shader pass.  
+  // Sample color. Tonemapping done in first shader pass.
   vec4 textureColor = texture(renderedTexture, uv);
 
   // Use the following to check for any intensity at all.
@@ -43,7 +43,7 @@ Fragment getFragment() {
 
   Fragment frag;
   frag.color = textureColor;
-  // Place stars at back to begin with. 
+  // Place stars at back to begin with.
   frag.depth = DEFAULT_DEPTH;
   frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
   frag.blend = BLEND_MODE_NORMAL;
diff --git a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
index ebca0af85c..09c5548510 100644
--- a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
@@ -39,7 +39,7 @@ const float DEFAULT_DEPTH = 3.08567758e19; // 1000 Pc
 
 Fragment getFragment() {
   vec4 color = vec4(0.0);
-  
+
   // GL_POINTS
 
   // Use frustum params to be able to compensate for a skewed frustum (in a dome).
@@ -55,21 +55,21 @@ Fragment getFragment() {
   float planeAspect = yFactor / xFactor; // Equals: (right - left) / (top - bottom)
   float screenAspect = screenSize.x / screenSize.y;
   float fullAspect = planeAspect / screenAspect;
-  
-  // Find screenPos in skewed frustum. uv is [0, 1]
-  vec2 screenPos = uv * vec2(right - left, top - bottom) + vec2(left, bottom); 
 
-  // Find our elliptic scale factors by trigonometric approximation. 
+  // Find screenPos in skewed frustum. uv is [0, 1]
+  vec2 screenPos = uv * vec2(right - left, top - bottom) + vec2(left, bottom);
+
+  // Find our elliptic scale factors by trigonometric approximation.
   float beta = atan(length(screenPos) / near);
-  vec2 sigmaScaleFactor = vec2(1.0 / cos(beta), 1.0 / pow(cos(beta), 2.0)); 
+  vec2 sigmaScaleFactor = vec2(1.0 / cos(beta), 1.0 / pow(cos(beta), 2.0));
 
   float defaultScreen = 1200.0;
   float scaling = screenSize.y / defaultScreen * yFactor;
 
   // Scale filter size depending on screen pos.
   vec2 filterScaleFactor = vec2(
-    pow(screenPos.x / near, 2.0) * fullAspect,  
-    pow(screenPos.y / near, 2.0)  
+    pow(screenPos.x / near, 2.0) * fullAspect,
+    pow(screenPos.y / near, 2.0)
   );
 
   // Use to ignore scaling.
@@ -91,8 +91,8 @@ Fragment getFragment() {
   // Uncomment to compare to original filterSize (assumes origo in center of screen).
   //screenPos = (uv - 0.5) * 2.0; // [-1, 1]
   //filterScaleFactor = vec2(
-  //    pow(screenPos.x, 2.0),  
-  //    pow(screenPos.y, 2.0)  
+  //    pow(screenPos.x, 2.0),
+  //    pow(screenPos.y, 2.0)
   //);
 
   // Make use of the following flag this to toggle betweeen circular and elliptic distribution.
@@ -131,20 +131,20 @@ Fragment getFragment() {
 
       // Calculate the contribution of this pixel (elliptic gaussian distribution).
       float pixelWeight = exp(-(
-          a * pow(x * fullAspect, 2.0) + 2 * b * x * y * fullAspect + c * pow(y, 2.0) 
+          a * pow(x * fullAspect, 2.0) + 2 * b * x * y * fullAspect + c * pow(y, 2.0)
       ));
-      
+
       // Only sample inside FBO texture and if the pixel will contribute to final color.
       if (all(greaterThan(sPoint, vec2(0.0))) && all(lessThan(sPoint, vec2(1.0))) &&
           pixelWeight > pixelWeightThreshold)
       {
         vec4 sIntensity = texture(renderedTexture, sPoint);
 
-        // Use normal distribution function for halo/bloom effect. 
+        // Use normal distribution function for halo/bloom effect.
         if (useCircleDist) {
           float circleDist = sqrt(pow(x / (1 + length(filterScaleFactor)), 2.0) +
             pow(y / (1 + length(filterScaleFactor)), 2.0));
-          intensity += sIntensity.rgb * (1.0 / (sigma * sqrt(2.0 * M_PI))) * 
+          intensity += sIntensity.rgb * (1.0 / (sigma * sqrt(2.0 * M_PI))) *
             exp(-(pow(circleDist, 2.0) / (2.0 * pow(sigma, 2.0)))) / filterSize;
         }
         else {
@@ -169,7 +169,7 @@ Fragment getFragment() {
 
   Fragment frag;
   frag.color = color;
-  // Place stars at back to begin with. 
+  // Place stars at back to begin with.
   frag.depth = DEFAULT_DEPTH;
   frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
   frag.blend = BLEND_MODE_NORMAL;
diff --git a/modules/gaia/shaders/gaia_vbo_vs.glsl b/modules/gaia/shaders/gaia_vbo_vs.glsl
index 53a624ef2a..cd1b7b8745 100644
--- a/modules/gaia/shaders/gaia_vbo_vs.glsl
+++ b/modules/gaia/shaders/gaia_vbo_vs.glsl
@@ -38,7 +38,7 @@ out float vs_cameraDistFromSun;
 uniform dmat4 model;
 uniform dmat4 view;
 uniform dmat4 projection;
-uniform float time; 
+uniform float time;
 uniform int renderOption;
 uniform vec2 posXThreshold;
 uniform vec2 posYThreshold;
@@ -50,7 +50,7 @@ uniform vec2 distThreshold;
 // Keep in sync with gaiaoptions.h:RenderOption enum
 const int RENDEROPTION_STATIC = 0;
 const int RENDEROPTION_COLOR = 1;
-const int RENDEROPTION_MOTION = 2; 
+const int RENDEROPTION_MOTION = 2;
 const float EPS = 1e-5;
 const float Parsec = 3.0856776e16;
 
@@ -59,24 +59,24 @@ void main() {
   vs_brightness = in_brightness;
 
   // Check if we should filter this star by position. Thres depending on original values.
-  if ((abs(posXThreshold.x) > EPS && in_position.x < posXThreshold.x) || 
-      (abs(posXThreshold.y) > EPS && in_position.x > posXThreshold.y) || 
-      (abs(posYThreshold.x) > EPS && in_position.y < posYThreshold.x) || 
-      (abs(posYThreshold.y) > EPS && in_position.y > posYThreshold.y) || 
-      (abs(posZThreshold.x) > EPS && in_position.z < posZThreshold.x) || 
-      (abs(posZThreshold.y) > EPS && in_position.z > posZThreshold.y) || 
-      (abs(distThreshold.x - distThreshold.y) < EPS 
+  if ((abs(posXThreshold.x) > EPS && in_position.x < posXThreshold.x) ||
+      (abs(posXThreshold.y) > EPS && in_position.x > posXThreshold.y) ||
+      (abs(posYThreshold.x) > EPS && in_position.y < posYThreshold.x) ||
+      (abs(posYThreshold.y) > EPS && in_position.y > posYThreshold.y) ||
+      (abs(posZThreshold.x) > EPS && in_position.z < posZThreshold.x) ||
+      (abs(posZThreshold.y) > EPS && in_position.z > posZThreshold.y) ||
+      (abs(distThreshold.x - distThreshold.y) < EPS
       && 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.x - 20.0f) > EPS && in_brightness.x < gMagThreshold.x) ||
       (abs(gMagThreshold.y - 20.0f) > 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.x) > EPS && in_brightness.y < bpRpThreshold.x) ||
       (abs(bpRpThreshold.y) > EPS && in_brightness.y > bpRpThreshold.y))))
   {
     // Discard star in geometry shader.
-    vs_gPosition = vec4(0.0);    
+    vs_gPosition = vec4(0.0);
     gl_Position = vec4(0.0);
     return;
   }
@@ -92,12 +92,12 @@ void main() {
 
   // Thres moving stars by their new position.
   float distPosition = length(objectPosition.xyz / (1000.0 * Parsec));
-  if ((abs(distThreshold.x - distThreshold.y) > EPS && 
-      ((abs(distThreshold.x) > EPS && distPosition< distThreshold.x) || 
+  if ((abs(distThreshold.x - distThreshold.y) > EPS &&
+      ((abs(distThreshold.x) > EPS && distPosition< distThreshold.x) ||
       (abs(distThreshold.y) > EPS && distPosition > distThreshold.y))))
   {
     // Discard star in geometry shader.
-    vs_gPosition = vec4(0.0);    
+    vs_gPosition = vec4(0.0);
     gl_Position = vec4(0.0);
     return;
   }
@@ -112,11 +112,11 @@ 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) {
-    vs_gPosition = vec4(model * objectPosition);    
+    vs_gPosition = vec4(model * objectPosition);
     gl_Position = vec4(projection * viewPosition);
   }
   else {
-    vs_gPosition = vec4(0.0);    
+    vs_gPosition = vec4(0.0);
     gl_Position = vec4(0.0);
   }
 }
diff --git a/modules/globebrowsing/CMakeLists.txt b/modules/globebrowsing/CMakeLists.txt
index 1bc921acf4..31899a4ff0 100644
--- a/modules/globebrowsing/CMakeLists.txt
+++ b/modules/globebrowsing/CMakeLists.txt
@@ -58,6 +58,7 @@ set(HEADER_FILES
   src/tileindex.h
   src/tileloadjob.h
   src/tiletextureinitdata.h
+  src/tilecacheproperties.h
   src/timequantizer.h
   src/tileprovider/defaulttileprovider.h
   src/tileprovider/imagesequencetileprovider.h
diff --git a/modules/globebrowsing/ext/gdal/include/cpl_conv.h b/modules/globebrowsing/ext/gdal/include/cpl_conv.h
index 7982dc268e..df9a42696d 100644
--- a/modules/globebrowsing/ext/gdal/include/cpl_conv.h
+++ b/modules/globebrowsing/ext/gdal/include/cpl_conv.h
@@ -369,9 +369,9 @@ namespace cpl
     /** Use cpl::down_cast<Derived*>(pointer_to_base) as equivalent of
      * static_cast<Derived*>(pointer_to_base) with safe checking in debug
      * mode.
-     * 
+     *
      * Only works if no virtual inheritance is involved.
-     * 
+     *
      * @param f pointer to a base class
      * @return pointer to a derived class
      */
diff --git a/modules/globebrowsing/ext/gdal/include/cpl_http.h b/modules/globebrowsing/ext/gdal/include/cpl_http.h
index 7a6b58f541..44626bf958 100644
--- a/modules/globebrowsing/ext/gdal/include/cpl_http.h
+++ b/modules/globebrowsing/ext/gdal/include/cpl_http.h
@@ -148,7 +148,7 @@ bool CPLIsMachinePotentiallyGCEInstance();
 bool CPLIsMachineForSureGCEInstance();
 
 /** Manager of Google OAuth2 authentication.
- * 
+ *
  * This class handles different authentication methods and handles renewal
  * of access token.
  *
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 20c04f5e60..a0d86ecc73 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -91,43 +91,24 @@
 namespace {
     constexpr std::string_view _loggerCat = "GlobeBrowsingModule";
 
-    constexpr openspace::properties::Property::PropertyInfo WMSCacheEnabledInfo = {
-        "WMSCacheEnabled",
-        "WMS Cache Enabled",
-        "Determines whether automatic caching of WMS servers is enabled. Changing the "
-        "value of this property will not affect already created WMS datasets"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo OfflineModeInfo = {
-        "OfflineMode",
-        "Offline Mode",
-        "Determines whether loaded WMS servers should be used in offline mode, that is "
-        "not even try to retrieve images through an internet connection. Please note "
-        "that this setting is only reasonable, if the caching is enabled and there is "
-        "available cached data. Changing the value of this property will not affect "
-        "already created WMS datasets"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo WMSCacheLocationInfo = {
-        "WMSCacheLocation",
-        "WMS Cache Location",
-        "The location of the cache folder for WMS servers. Changing the value of this "
-        "property will not affect already created WMS datasets"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo WMSCacheSizeInfo = {
-        "WMSCacheSize",
-        "WMS Cache Size",
-        "The maximum size of the cache for each WMS server. Changing the value of this "
-        "property will not affect already created WMS datasets"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo TileCacheSizeInfo = {
         "TileCacheSize",
         "Tile Cache Size",
         "The maximum size of the MemoryAwareTileCache, on the CPU and GPU"
     };
 
+    constexpr openspace::properties::Property::PropertyInfo MRFCacheEnabledInfo = {
+        "MRFCacheEnabled",
+        "MRF Cache Enabled",
+        "Determines whether automatic caching of globe browsing data is enabled."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo MRFCacheLocationInfo = {
+        "MRFCacheLocation",
+        "MRF Cache Location",
+        "The location of the root folder for the MRF cache of globe browsing data."
+    };
+
     openspace::GlobeBrowsingModule::Capabilities
     parseSubDatasets(char** subDatasets, int nSubdatasets)
     {
@@ -185,25 +166,15 @@ namespace {
     }
 
     struct [[codegen::Dictionary(GlobeBrowsingModule)]] Parameters {
-        // [[codegen::verbatim(WMSCacheEnabledInfo.description)]]
-        std::optional<bool> cacheEnabled [[codegen::key("WMSCacheEnabled")]];
-
-        // [[codegen::verbatim(OfflineModeInfo.description)]]
-        std::optional<bool> offlineMode;
-
-        // [[codegen::verbatim(WMSCacheLocationInfo.description)]]
-        std::optional<std::string> cacheLocation [[codegen::key("WMSCacheLocation")]];
-
-        // [[codegen::verbatim(WMSCacheSizeInfo.description)]]
-        std::optional<int> wmsCacheSize [[codegen::key("WMSCacheSize")]];
 
         // [[codegen::verbatim(TileCacheSizeInfo.description)]]
         std::optional<int> tileCacheSize;
 
-        // If you know what you are doing and you have WMS caching *disabled* but offline
-        // mode *enabled*, you can set this value to 'true' to silence a warning that you
-        // would otherwise get at startup
-        std::optional<bool> noWarning;
+        // [[codegen::verbatim(MRFCacheEnabledInfo.description)]]
+        std::optional<bool> mrfCacheEnabled [[codegen::key("MRFCacheEnabled")]];
+
+        // [[codegen::verbatim(MRFCacheLocationInfo.description)]]
+        std::optional<std::string> mrfCacheLocation [[codegen::key("MRFCacheLocation")]];
     };
 #include "globebrowsingmodule_codegen.cpp"
 } // namespace
@@ -212,40 +183,22 @@ namespace openspace {
 
 GlobeBrowsingModule::GlobeBrowsingModule()
     : OpenSpaceModule(Name)
-    , _wmsCacheEnabled(WMSCacheEnabledInfo, false)
-    , _offlineMode(OfflineModeInfo, false)
-    , _wmsCacheLocation(WMSCacheLocationInfo, "${BASE}/cache_gdal")
-    , _wmsCacheSizeMB(WMSCacheSizeInfo, 1024)
     , _tileCacheSizeMB(TileCacheSizeInfo, 1024)
+    , _mrfCacheEnabled(MRFCacheEnabledInfo, false)
+    , _mrfCacheLocation(MRFCacheLocationInfo, "${BASE}/cache_mrf")
 {
-    addProperty(_wmsCacheEnabled);
-    addProperty(_offlineMode);
-    addProperty(_wmsCacheLocation);
-    addProperty(_wmsCacheSizeMB);
     addProperty(_tileCacheSizeMB);
+    addProperty(_mrfCacheEnabled);
+    addProperty(_mrfCacheLocation);
 }
 
 void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
     using namespace globebrowsing;
 
     const Parameters p = codegen::bake<Parameters>(dict);
-    _wmsCacheEnabled = p.cacheEnabled.value_or(_wmsCacheEnabled);
-    _offlineMode = p.offlineMode.value_or(_offlineMode);
-    _wmsCacheLocation = p.cacheLocation.value_or(_wmsCacheLocation);
-    _wmsCacheSizeMB = p.wmsCacheSize.value_or(_wmsCacheSizeMB);
     _tileCacheSizeMB = p.tileCacheSize.value_or(_tileCacheSizeMB);
-    const bool noWarning = p.noWarning.value_or(false);
-
-    if (!_wmsCacheEnabled && _offlineMode && !noWarning) {
-        LWARNINGC(
-            "GlobeBrowsingModule",
-            "WMS caching is disabled, but offline mode is enabled. Unless you know "
-            "what you are doing, this will probably cause many servers to stop working. "
-            "If you want to silence this warning, set the 'NoWarning' parameter to "
-            "'true'"
-        );
-    }
-
+    _mrfCacheEnabled = p.mrfCacheEnabled.value_or(_mrfCacheEnabled);
+    _mrfCacheLocation = p.mrfCacheLocation.value_or(_mrfCacheLocation);
 
     // Initialize
     global::callback::initializeGL->emplace_back([&]() {
@@ -670,21 +623,12 @@ bool GlobeBrowsingModule::hasUrlInfo(const std::string& globe) const {
     return _urlList.find(globe) != _urlList.end();
 }
 
-bool GlobeBrowsingModule::isWMSCachingEnabled() const {
-    return _wmsCacheEnabled;
+bool GlobeBrowsingModule::isMRFCachingEnabled() const {
+    return _mrfCacheEnabled;
 }
 
-bool GlobeBrowsingModule::isInOfflineMode() const {
-    return _offlineMode;
-}
-
-std::string GlobeBrowsingModule::wmsCacheLocation() const {
-    return _wmsCacheLocation;
-}
-
-uint64_t GlobeBrowsingModule::wmsCacheSize() const {
-    uint64_t size = _wmsCacheSizeMB;
-    return size * 1024 * 1024;
+const std::string GlobeBrowsingModule::mrfCacheLocation() const {
+    return _mrfCacheLocation;
 }
 
 scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const {
diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h
index 3539b6f077..3902e5b663 100644
--- a/modules/globebrowsing/globebrowsingmodule.h
+++ b/modules/globebrowsing/globebrowsingmodule.h
@@ -92,10 +92,8 @@ public:
 
     void removeWMSServer(const std::string& name);
 
-    bool isWMSCachingEnabled() const;
-    bool isInOfflineMode() const;
-    std::string wmsCacheLocation() const;
-    uint64_t wmsCacheSize() const; // bytes
+    bool isMRFCachingEnabled() const;
+    const std::string mrfCacheLocation() const;
 
 protected:
     void internalInitialize(const ghoul::Dictionary&) override;
@@ -113,12 +111,11 @@ private:
     glm::dquat lookDownCameraRotation(const globebrowsing::RenderableGlobe& globe,
         glm::dvec3 cameraPositionModelSpace, globebrowsing::Geodetic2 geo2);
 
-    properties::BoolProperty _wmsCacheEnabled;
-    properties::BoolProperty _offlineMode;
-    properties::StringProperty _wmsCacheLocation;
-    properties::UIntProperty _wmsCacheSizeMB;
     properties::UIntProperty _tileCacheSizeMB;
 
+    properties::BoolProperty _mrfCacheEnabled;
+    properties::StringProperty _mrfCacheLocation;
+
     std::unique_ptr<globebrowsing::cache::MemoryAwareTileCache> _tileCache;
 
     // name -> capabilities
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 7320e0cf6d..9881a65fe0 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -56,6 +56,9 @@ namespace {
         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);
+
     // Get the dictionary defining the layer
     Layer* l = globe->layerManager().addLayer(groupID, layer);
     if (l) {
@@ -182,7 +185,7 @@ namespace {
     if (group == layers::Group::ID::Unknown) {
         throw ghoul::lua::LuaError(fmt::format("Unknown layer group: {}", layerGroup));
     }
-    
+
     LayerGroup& lg = globe->layerManager().layerGroup(group);
     if (std::holds_alternative<int>(source) && std::holds_alternative<int>(destination)) {
         // Short circut here, no need to get the layers
diff --git a/modules/globebrowsing/shaders/advanced_rings_fs.glsl b/modules/globebrowsing/shaders/advanced_rings_fs.glsl
index d428257405..e852929d1e 100644
--- a/modules/globebrowsing/shaders/advanced_rings_fs.glsl
+++ b/modules/globebrowsing/shaders/advanced_rings_fs.glsl
@@ -45,6 +45,7 @@ uniform vec3 sunPositionObj;
 uniform vec3 camPositionObj;
 uniform float nightFactor;
 uniform float zFightingPercentage;
+uniform float opacity;
 
 
 Fragment getFragment() {
@@ -123,6 +124,7 @@ Fragment getFragment() {
   Fragment frag;
 
   frag.color = diffuse * shadow;
+  frag.color.a *= opacity;
   frag.depth = vs_screenSpaceDepth;
   frag.gPosition = vec4(1e30, 1e30, 1e30, 1.0);
   frag.gNormal = vec4(normal, 1.0);
diff --git a/modules/globebrowsing/shaders/rings_fs.glsl b/modules/globebrowsing/shaders/rings_fs.glsl
index 64665803fd..75e0a8361a 100644
--- a/modules/globebrowsing/shaders/rings_fs.glsl
+++ b/modules/globebrowsing/shaders/rings_fs.glsl
@@ -39,6 +39,7 @@ uniform float colorFilterValue;
 uniform vec3 sunPosition;
 uniform float nightFactor;
 uniform float zFightingPercentage;
+uniform float opacity;
 
 
 Fragment getFragment() {
@@ -111,6 +112,7 @@ Fragment getFragment() {
   Fragment frag;
 
   frag.color = diffuse * shadow;
+  frag.color.a *= opacity;
   frag.depth = vs_screenSpaceDepth;
   frag.gPosition = vec4(1e30, 1e30, 1e30, 1.0);
   frag.gNormal = vec4(normal, 1.0);
diff --git a/modules/globebrowsing/shaders/texturetilemapping.glsl b/modules/globebrowsing/shaders/texturetilemapping.glsl
index eb7647d711..dd70e3631e 100644
--- a/modules/globebrowsing/shaders/texturetilemapping.glsl
+++ b/modules/globebrowsing/shaders/texturetilemapping.glsl
@@ -185,7 +185,7 @@ vec4 getSample#{layerGroup}#{i}(vec2 uv, vec3 levelWeights,
 
 vec4 blend#{layerGroup}#{i}(vec4 currentColor, vec4 newColor, float blendFactor) {
 #if (#{#{layerGroup}#{i}BlendMode} == BlendModeDefault)
-  return blendNormal(currentColor, vec4(newColor.rgb, newColor.a * blendFactor)); 
+  return blendNormal(currentColor, vec4(newColor.rgb, newColor.a * blendFactor));
 #elif (#{#{layerGroup}#{i}BlendMode} == BlendModeMultiply)
   return blendMultiply(currentColor, newColor * blendFactor);
 #elif (#{#{layerGroup}#{i}BlendMode} == BlendModeAdd)
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index c8c13a0d60..a0516e9c3d 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -97,12 +97,6 @@ namespace {
         "The text color of the labels"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
-        "Opacity",
-        "Opacity",
-        "The opacity of the labels"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo FadeDistancesInfo = {
         "FadeDistances",
         "Fade-In Distances",
@@ -165,7 +159,7 @@ namespace {
         // [[codegen::verbatim(ColorInfo.description)]]
         std::optional<glm::vec3> color [[codegen::color()]];
 
-        // [[codegen::verbatim(OpacityInfo.description)]]
+        // The opacity of the labels
         std::optional<float> opacity [[codegen::inrange(0.f, 1.f)]];
 
         // [[codegen::verbatim(FadeDistancesInfo.description)]]
@@ -207,7 +201,6 @@ GlobeLabelsComponent::GlobeLabelsComponent()
     , _minMaxSize(MinMaxSizeInfo, glm::ivec2(1, 1000), glm::ivec2(1), glm::ivec2(1000))
     , _heightOffset(HeightOffsetInfo, 100.f, 0.f, 10000.f)
     , _color(ColorInfo, glm::vec3(1.f, 1.f, 0.f), glm::vec3(0.f), glm::vec3(1.f))
-    , _opacity(OpacityInfo, 1.f, 0.f, 1.f)
     , _fadeDistances(
         FadeDistancesInfo,
         glm::vec2(1e4f, 1e6f),
@@ -224,19 +217,21 @@ GlobeLabelsComponent::GlobeLabelsComponent()
     )
 {
     addProperty(_enabled);
+    addProperty(_color);
+    _color.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_opacity);
+    addProperty(_fade);
+
     addProperty(_fontSize);
     addProperty(_size);
     _minMaxSize.setViewOption(properties::Property::ViewOptions::MinMaxRange);
     addProperty(_minMaxSize);
-    addProperty(_color);
-    addProperty(_opacity);
     _fadeDistances.setViewOption(properties::Property::ViewOptions::MinMaxRange);
     _fadeDistances.setExponent(3.f);
     addProperty(_fadeDistances);
     addProperty(_fadeInEnabled);
     addProperty(_fadeOutEnabled);
     addProperty(_heightOffset);
-    _color.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_disableCulling);
     addProperty(_distanceEPS);
 
@@ -533,7 +528,7 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
 ) {
     glm::vec4 textColor = glm::vec4(
         glm::vec3(_color),
-        _opacity * fadeInVariable
+        opacity() * fadeInVariable
     );
 
     glm::dmat4 VP = glm::dmat4(data.camera.sgctInternal.projectionMatrix()) *
diff --git a/modules/globebrowsing/src/globelabelscomponent.h b/modules/globebrowsing/src/globelabelscomponent.h
index 841b65cdb2..9f0c418369 100644
--- a/modules/globebrowsing/src/globelabelscomponent.h
+++ b/modules/globebrowsing/src/globelabelscomponent.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_MODULE_GLOBEBROWSING___GLOBELABELSCOMPONENT___H__
 
 #include <openspace/properties/propertyowner.h>
+#include <openspace/rendering/fadeable.h>
 
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
@@ -47,7 +48,7 @@ struct RenderData;
 namespace documentation { struct Documentation; }
 namespace globebrowsing { class RenderableGlobe; }
 
-class GlobeLabelsComponent : public properties::PropertyOwner {
+class GlobeLabelsComponent : public properties::PropertyOwner, public Fadeable {
 public:
     GlobeLabelsComponent();
     ~GlobeLabelsComponent() override = default;
@@ -85,14 +86,11 @@ private:
     };
 
     properties::BoolProperty _enabled;
+    properties::Vec3Property _color;
     properties::FloatProperty _fontSize;
     properties::FloatProperty _size;
     properties::IVec2Property _minMaxSize;
     properties::FloatProperty _heightOffset;
-
-    properties::Vec3Property _color;
-    properties::FloatProperty _opacity;
-
     properties::Vec2Property _fadeDistances;
     properties::BoolProperty _fadeInEnabled;
     properties::BoolProperty _fadeOutEnabled;
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index 981fa0c006..d6529ee642 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -48,7 +48,7 @@ void GPULayerGroup::setValue(ghoul::opengl::ProgramObject& program,
         auto& galuc = gal.uniformCache;
         const Layer& al = *activeLayers[i];
 
-        program.setUniform(galuc.opacity, al.renderSettings().opacity);
+        program.setUniform(galuc.opacity, al.opacity());
         program.setUniform(galuc.gamma, al.renderSettings().gamma);
         program.setUniform(galuc.multiplier, al.renderSettings().multiplier);
         program.setUniform(galuc.offset, al.renderSettings().offset);
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 57ef993c45..ce0cd7e863 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -125,10 +125,10 @@ namespace {
         // borders
         std::optional<bool> padTiles;
 
-        struct Settings {
-            // The opacity value of the layer
-            std::optional<float> opacity [[codegen::inrange(0.0, 1.0)]];
+        // The opacity value of the layer
+        std::optional<float> opacity [[codegen::inrange(0.0, 1.0)]];
 
+        struct Settings {
             // The gamma value that is applied to each pixel of the layer
             std::optional<float> gamma;
 
@@ -228,8 +228,11 @@ Layer::Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGrou
     _padTilePixelStartOffset = initData.tilePixelStartOffset;
     _padTilePixelSizeDifference = initData.tilePixelSizeDifference;
 
+    _opacity = p.opacity.value_or(_opacity);
+    addProperty(_opacity);
+    addProperty(_fade);
+
     if (p.settings.has_value()) {
-        _renderSettings.opacity = p.settings->opacity.value_or(_renderSettings.opacity);
         _renderSettings.gamma = p.settings->gamma.value_or(_renderSettings.gamma);
         _renderSettings.multiplier =
             p.settings->multiplier.value_or(_renderSettings.multiplier);
diff --git a/modules/globebrowsing/src/layer.h b/modules/globebrowsing/src/layer.h
index fccba0b56f..6e20489085 100644
--- a/modules/globebrowsing/src/layer.h
+++ b/modules/globebrowsing/src/layer.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_MODULE_GLOBEBROWSING___LAYER___H__
 
 #include <openspace/properties/propertyowner.h>
+#include <openspace/rendering/fadeable.h>
 
 #include <modules/globebrowsing/src/basictypes.h>
 #include <modules/globebrowsing/src/layeradjustment.h>
@@ -42,7 +43,7 @@ struct LayerGroup;
 struct TileIndex;
 struct TileProvider;
 
-class Layer : public properties::PropertyOwner {
+class Layer : public properties::PropertyOwner, public Fadeable {
 public:
     Layer(layers::Group::ID id, const ghoul::Dictionary& layerDict, LayerGroup& parent);
 
diff --git a/modules/globebrowsing/src/layerrendersettings.cpp b/modules/globebrowsing/src/layerrendersettings.cpp
index 545023504c..f50f5a0ee2 100644
--- a/modules/globebrowsing/src/layerrendersettings.cpp
+++ b/modules/globebrowsing/src/layerrendersettings.cpp
@@ -32,14 +32,6 @@ namespace {
         "values"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
-        "Opacity",
-        "Opacity",
-        "This value sets the transparency of this layer. If this value is equal to '1', "
-        "the layer is completely opaque. If this value is equal to '0', the layer is "
-        "completely transparent"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo GammaInfo = {
         "Gamma",
         "Gamma",
@@ -65,20 +57,17 @@ namespace openspace::globebrowsing {
 
 LayerRenderSettings::LayerRenderSettings()
     : properties::PropertyOwner({ "Settings" })
-    , opacity(OpacityInfo, 1.f, 0.f, 1.f)
     , gamma(GammaInfo, 1.f, 0.f, 5.f)
     , multiplier(MultiplierInfo, 1.f, 0.f, 20.f)
     , offset(OffsetInfo, 0.f, -10000.f, 10000.f)
     , setDefault(SetDefaultInfo)
 {
-    addProperty(opacity);
     addProperty(gamma);
     addProperty(multiplier);
     addProperty(offset);
     addProperty(setDefault);
 
     setDefault.onChange([this](){
-        opacity = 1.f;
         gamma = 1.f;
         multiplier = 1.f;
         offset = 0.f;
@@ -86,7 +75,6 @@ LayerRenderSettings::LayerRenderSettings()
 }
 
 void LayerRenderSettings::onChange(std::function<void()> callback) {
-    opacity.onChange(callback);
     gamma.onChange(callback);
     multiplier.onChange(callback);
     multiplier.onChange(callback);
@@ -95,7 +83,7 @@ void LayerRenderSettings::onChange(std::function<void()> callback) {
 
 float LayerRenderSettings::performLayerSettings(float v) const {
     return
-        ((glm::sign(v) * glm::pow(glm::abs(v), gamma) * multiplier) + offset) * opacity;
+        ((glm::sign(v) * glm::pow(glm::abs(v), gamma) * multiplier) + offset);
 }
 
 glm::vec4 LayerRenderSettings::performLayerSettings(const glm::vec4& currentValue) const {
diff --git a/modules/globebrowsing/src/layerrendersettings.h b/modules/globebrowsing/src/layerrendersettings.h
index 1a417eb470..69ffad1a50 100644
--- a/modules/globebrowsing/src/layerrendersettings.h
+++ b/modules/globebrowsing/src/layerrendersettings.h
@@ -35,7 +35,6 @@ namespace openspace::globebrowsing {
 struct LayerRenderSettings : public properties::PropertyOwner {
     LayerRenderSettings();
 
-    properties::FloatProperty opacity;
     properties::FloatProperty gamma;
     properties::FloatProperty multiplier;
     properties::FloatProperty offset;
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index d7d5a1536e..dfd4e3ad45 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -34,7 +34,6 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/exception.h>
 #include <ghoul/misc/profiling.h>
-#include <filesystem>
 
 #ifdef _MSC_VER
 #pragma warning (push)
@@ -54,11 +53,13 @@
 
 #include <algorithm>
 #include <fstream>
+#include <filesystem>
+#include <system_error>
 
 namespace openspace::globebrowsing {
 
 namespace {
-
+    constexpr std::string_view _loggerCat = "RawTileDataReader";
 // These are some locations in memory taken from ESRI's No Data Available tile so that we
 // can spotcheck these tiles and not present them
 // The pair is <byte index, expected value>
@@ -421,9 +422,11 @@ RawTile::ReadError postProcessErrorCheck(const RawTile& rawTile,
 
 RawTileDataReader::RawTileDataReader(std::string filePath,
                                      TileTextureInitData initData,
+                                     TileCacheProperties cacheProperties,
                                      PerformPreprocessing preprocess)
     : _datasetFilePath(std::move(filePath))
     , _initData(std::move(initData))
+    , _cacheProperties(std::move(cacheProperties))
     , _preprocess(preprocess)
 {
     ZoneScoped;
@@ -439,83 +442,115 @@ RawTileDataReader::~RawTileDataReader() {
     }
 }
 
+std::optional<std::string> RawTileDataReader::mrfCache() {
+    // We don't support these formats as they will typically lack
+    // crucial imformation such as GeoTags. It also makes little sense to
+    // cache them as they are already local files.
+    // If it is crucial to cache a dataset of this type, convert it to geotiff.
+    constexpr std::array<std::string_view, 11> Unsupported = {
+        "jpeg", "jpg",
+        "png",
+        "bmp",
+        "psd",
+        "tga",
+        "gif",
+        "hdr",
+        "pic",
+        "ppm", "pgm"
+    };
+
+    for (std::string_view fmt : Unsupported) {
+        if (_datasetFilePath.ends_with(fmt)) {
+            LWARNING(fmt::format(
+                "Unsupported file format for MRF caching: {}, Dataset: {}",
+                fmt, _datasetFilePath
+            ));
+            return std::nullopt;
+        }
+    }
+
+    GlobeBrowsingModule& module = *global::moduleEngine->module<GlobeBrowsingModule>();
+
+    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();
+    std::string mrf = root + datasetIdentifier + ".mrf";
+    std::string cache = root + datasetIdentifier + ".mrfcache";
+
+    if (!std::filesystem::exists(mrf)) {
+        std::error_code ec;
+        if (!std::filesystem::create_directories(root, ec)) {
+            // Already existing directories causes a 'failure' but no error
+            if (ec) {
+                LWARNING(fmt::format(
+                    "Failed to create directories for cache at: {}. Error Code: {}, message: {}",
+                    root, std::to_string(ec.value()), ec.message()
+                ));
+                return std::nullopt;
+            }
+        }
+
+        GDALDriver* driver = GetGDALDriverManager()->GetDriverByName("MRF");
+        if (driver != nullptr) {
+            GDALDataset* src = static_cast<GDALDataset*>(GDALOpen(_datasetFilePath.c_str(), GA_ReadOnly));
+            if (!src) {
+                LWARNING(fmt::format(
+                    "Failed to load dataset: {}. GDAL Error: {}",
+                    _datasetFilePath, CPLGetLastErrorMsg()
+                ));
+                return std::nullopt;
+            }
+
+            defer{ GDALClose(src); };
+
+            char** createOpts = nullptr;
+            createOpts = CSLSetNameValue(createOpts, "CACHEDSOURCE", _datasetFilePath.c_str());
+            createOpts = CSLSetNameValue(createOpts, "NOCOPY", "true");
+            createOpts = CSLSetNameValue(createOpts, "uniform_scale", "2");
+            createOpts = CSLSetNameValue(createOpts, "compress", _cacheProperties.compression.c_str());
+            createOpts = CSLSetNameValue(createOpts, "quality", std::to_string(_cacheProperties.quality).c_str());
+            createOpts = CSLSetNameValue(createOpts, "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));
+            if (!dst) {
+                LWARNING(fmt::format(
+                    "Failed to create MRF Caching dataset dataset: {}. GDAL Error: {}",
+                    mrf, CPLGetLastErrorMsg()
+                ));
+                return std::nullopt;
+            }
+            GDALClose(dst);
+
+            return mrf;
+        }
+        else {
+            LWARNING("Failed to create MRF driver");
+            return std::nullopt;
+        }
+    }
+    else {
+        return mrf;
+    }
+}
+
 void RawTileDataReader::initialize() {
     ZoneScoped;
 
     if (_datasetFilePath.empty()) {
         throw ghoul::RuntimeError("File path must not be empty");
     }
-
-    GlobeBrowsingModule& module = *global::moduleEngine->module<GlobeBrowsingModule>();
-
     std::string content = _datasetFilePath;
-    if (module.isWMSCachingEnabled()) {
-        ZoneScopedN("WMS Caching");
-        std::string c;
-        if (std::filesystem::is_regular_file(_datasetFilePath)) {
-            // Only replace the 'content' if the dataset is an XML file and we want to do
-            // caching
-            std::ifstream t(_datasetFilePath);
-            c.append(
-                (std::istreambuf_iterator<char>(t)),
-                std::istreambuf_iterator<char>()
-            );
-        }
-        else {
-            //GDAL input case for configuration string (e.g. temporal data)
-            c = _datasetFilePath;
-        }
 
-        if (c.size() > 10 && c.substr(0, 10) == "<GDAL_WMS>") {
-            // We know that _datasetFilePath is an XML file, so now we add a Cache line
-            // into it iff there isn't already one in the XML and if the configuration
-            // says we should
+    if (_cacheProperties.enabled) {
+        ZoneScopedN("MRF Caching");
 
-            // 1. Parse XML
-            // 2. Inject Cache tag if it isn't already there
-            // 3. Serialize XML to pass into GDAL
-
-            LDEBUGC(_datasetFilePath, "Inserting caching tag");
-
-            bool shouldSerializeXml = false;
-
-            CPLXMLNode* root = CPLParseXMLString(c.c_str());
-            CPLXMLNode* cache = CPLSearchXMLNode(root, "Cache");
-            if (!cache) {
-                // If there already is a cache, we don't want to modify it
-                cache = CPLCreateXMLNode(root, CXT_Element, "Cache");
-
-                CPLCreateXMLElementAndValue(
-                    cache,
-                    "Path",
-                    absPath(module.wmsCacheLocation()).string().c_str()
-                );
-                CPLCreateXMLElementAndValue(cache, "Depth", "4");
-                CPLCreateXMLElementAndValue(cache, "Expires", "315576000"); // 10 years
-                CPLCreateXMLElementAndValue(
-                    cache,
-                    "MaxSize",
-                    std::to_string(module.wmsCacheSize()).c_str()
-                );
-
-                // The serialization only needs to be one if the cache didn't exist
-                // already
-                shouldSerializeXml = true;
-            }
-
-            if (module.isInOfflineMode()) {
-                CPLXMLNode* offlineMode = CPLSearchXMLNode(root, "OfflineMode");
-                if (!offlineMode) {
-                    CPLCreateXMLElementAndValue(root, "OfflineMode", "true");
-                    shouldSerializeXml = true;
-                }
-            }
-
-
-            if (shouldSerializeXml) {
-                content = std::string(CPLSerializeXMLTree(root));
-                //CPLSerializeXMLTreeToFile(root, (_datasetFilePath + ".xml").c_str());
-            }
+        std::optional<std::string> cache = mrfCache();
+        if (cache.has_value()) {
+            content = cache.value();
         }
     }
 
diff --git a/modules/globebrowsing/src/rawtiledatareader.h b/modules/globebrowsing/src/rawtiledatareader.h
index c58ea2da80..7d23d4bfeb 100644
--- a/modules/globebrowsing/src/rawtiledatareader.h
+++ b/modules/globebrowsing/src/rawtiledatareader.h
@@ -28,6 +28,7 @@
 #include <modules/globebrowsing/src/basictypes.h>
 #include <modules/globebrowsing/src/rawtile.h>
 #include <modules/globebrowsing/src/tiletextureinitdata.h>
+#include <modules/globebrowsing/src/tilecacheproperties.h>
 #include <ghoul/misc/boolean.h>
 #include <string>
 #include <mutex>
@@ -53,6 +54,7 @@ public:
      * \param baseDirectory, the base directory to use in future loading operations
      */
     RawTileDataReader(std::string filePath, TileTextureInitData initData,
+        TileCacheProperties cacheProperties,
         PerformPreprocessing preprocess = PerformPreprocessing::No);
     ~RawTileDataReader();
 
@@ -65,6 +67,8 @@ public:
     glm::ivec2 fullPixelSize() const;
 
 private:
+    std::optional<std::string> mrfCache();
+    
     void initialize();
 
     RawTile::ReadError rasterRead(int rasterBand, const IODescription& io,
@@ -97,6 +101,7 @@ private:
     int _maxChunkLevel = -1;
 
     const TileTextureInitData _initData;
+    const TileCacheProperties _cacheProperties;
     const PerformPreprocessing _preprocess;
     TileDepthTransform _depthTransform = { .scale = 0.f, .offset = 0.f };
 
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 439a939b0e..6fa031d31c 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -655,6 +655,7 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     // Components
     _hasRings = p.rings.has_value();
     if (_hasRings) {
+        _ringsComponent.setParentFadeable(this);
         _ringsComponent.initialize();
         addPropertySubOwner(_ringsComponent);
     }
@@ -676,6 +677,9 @@ 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();
@@ -749,7 +753,9 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
 
                 // Render from light source point of view
                 renderChunks(lightRenderData, rendererTask, {}, true);
-                if (_hasRings && _ringsComponent.isEnabled()) {
+                if (_hasRings && _ringsComponent.isEnabled() &&
+                    _ringsComponent.isVisible())
+                {
                     _ringsComponent.draw(
                         lightRenderData,
                         RingsComponent::RenderPass::GeometryOnly
@@ -762,7 +768,9 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
 
                 // Render again from original point of view
                 renderChunks(data, rendererTask, _shadowComponent.shadowMapData());
-                if (_hasRings && _ringsComponent.isEnabled()) {
+                if (_hasRings && _ringsComponent.isEnabled() &&
+                    _ringsComponent.isVisible())
+                {
                     _ringsComponent.draw(
                         data,
                         RingsComponent::RenderPass::GeometryAndShading,
@@ -772,7 +780,9 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
             }
             else {
                 renderChunks(data, rendererTask);
-                if (_hasRings && _ringsComponent.isEnabled()) {
+                if (_hasRings && _ringsComponent.isEnabled() &&
+                    _ringsComponent.isVisible())
+                {
                     _ringsComponent.draw(
                         data,
                         RingsComponent::RenderPass::GeometryAndShading
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index c7e706e180..1927f1e61e 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -53,18 +53,18 @@
 namespace {
     constexpr std::string_view _loggerCat = "RingsComponent";
 
-    constexpr std::array<const char*, 9> UniformNames = {
+    constexpr std::array<const char*, 10> UniformNames = {
         "modelViewProjectionMatrix", "textureOffset", "colorFilterValue", "nightFactor",
         "sunPosition", "ringTexture", "shadowMatrix", "shadowMapTexture",
-        "zFightingPercentage"
+        "zFightingPercentage", "opacity"
     };
 
-    constexpr std::array<const char*, 15> UniformNamesAdvancedRings = {
+    constexpr std::array<const char*, 16> UniformNamesAdvancedRings = {
         "modelViewProjectionMatrix", "textureOffset", "colorFilterValue", "nightFactor",
         "sunPosition", "sunPositionObj", "camPositionObj", "ringTextureFwrd",
         "ringTextureBckwrd", "ringTextureUnlit", "ringTextureColor",
         "ringTextureTransparency", "shadowMatrix", "shadowMapTexture",
-        "zFightingPercentage"
+        "zFightingPercentage", "opacity"
     };
 
     constexpr std::array<const char*, 3> GeomUniformNames = {
@@ -248,6 +248,8 @@ void RingsComponent::initialize() {
     const Parameters p = codegen::bake<Parameters>(_ringsDictionary);
 
     addProperty(_enabled);
+    addProperty(_opacity);
+    addProperty(_fade);
 
     _size.setExponent(15.f);
     _size = p.size.value_or(_size);
@@ -473,6 +475,7 @@ void RingsComponent::draw(const RenderData& data, RenderPass renderPass,
                 _uniformCacheAdvancedRings.ringTextureTransparency,
                 ringTextureTransparencyUnit
             );
+            _shader->setUniform(_uniformCacheAdvancedRings.opacityValue, 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
@@ -507,7 +510,6 @@ void RingsComponent::draw(const RenderData& data, RenderPass renderPass,
             glEnable(GL_DEPTH_TEST);
             glEnablei(GL_BLEND, 0);
             glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
         }
         else {
             _shader->setUniform(
@@ -523,6 +525,7 @@ void RingsComponent::draw(const RenderData& data, RenderPass renderPass,
                 _uniformCache.modelViewProjectionMatrix,
                 modelViewProjectionTransform
             );
+            _shader->setUniform(_uniformCache.opacityValue, opacity());
 
             ringTextureUnit.activate();
             _texture->bind();
diff --git a/modules/globebrowsing/src/ringscomponent.h b/modules/globebrowsing/src/ringscomponent.h
index d8211dcda8..8b13207348 100644
--- a/modules/globebrowsing/src/ringscomponent.h
+++ b/modules/globebrowsing/src/ringscomponent.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_MODULE_GLOBEBROWSING___RINGSCOMPONENT___H__
 
 #include <openspace/properties/propertyowner.h>
+#include <openspace/rendering/fadeable.h>
 
 #include <modules/globebrowsing/src/shadowcomponent.h>
 #include <openspace/properties/stringproperty.h>
@@ -48,7 +49,7 @@ namespace openspace {
 
 namespace documentation { struct Documentation; }
 
-class RingsComponent : public properties::PropertyOwner {
+class RingsComponent : public properties::PropertyOwner, public Fadeable {
 public:
     enum class RenderPass {
         GeometryOnly,
@@ -95,12 +96,13 @@ private:
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
     std::unique_ptr<ghoul::opengl::ProgramObject> _geometryOnlyShader;
     UniformCache(modelViewProjectionMatrix, textureOffset, colorFilterValue, nightFactor,
-        sunPosition, ringTexture, shadowMatrix, shadowMapTexture, zFightingPercentage
+        sunPosition, ringTexture, shadowMatrix, shadowMapTexture, zFightingPercentage,
+        opacityValue
     ) _uniformCache;
     UniformCache(modelViewProjectionMatrix, textureOffset, colorFilterValue, nightFactor,
         sunPosition, sunPositionObj, camPositionObj, ringTextureFwrd, ringTextureBckwrd,
         ringTextureUnlit, ringTextureColor, ringTextureTransparency, shadowMatrix,
-        shadowMapTexture, zFightingPercentage
+        shadowMapTexture, zFightingPercentage, opacityValue
     ) _uniformCacheAdvancedRings;
     UniformCache(modelViewProjectionMatrix, textureOffset, ringTexture
     ) _geomUniformCache;
diff --git a/modules/globebrowsing/src/tilecacheproperties.h b/modules/globebrowsing/src/tilecacheproperties.h
new file mode 100644
index 0000000000..360d382946
--- /dev/null
+++ b/modules/globebrowsing/src/tilecacheproperties.h
@@ -0,0 +1,42 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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_GLOBEBROWSING___TILE_CACHE_PROPERTIES___H__
+#define __OPENSPACE_MODULE_GLOBEBROWSING___TILE_CACHE_PROPERTIES___H__
+
+#include <string>
+
+namespace openspace::globebrowsing {
+
+struct TileCacheProperties {
+    bool enabled = false;
+    std::string compression;
+    std::string path;
+    int quality;
+    int blockSize;
+};
+
+} // namespace openspace::globebrowsing
+
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_CACHE_PROPERTIES___H__
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
index 44635e21e8..4dd907a078 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
@@ -48,10 +48,25 @@ namespace {
         "complete image if a single image is used"
     };
 
+    constexpr openspace::properties::Property::PropertyInfo CompressionInfo = {
+        "Compression",
+        "Compression Algorithm",
+        "The compression algorithm to use for MRF cached tiles"
+    };
+
+    enum class [[codegen::stringify()]] Compression {
+        PNG = 0,
+        JPEG,
+        LERC
+    };
+
     struct [[codegen::Dictionary(DefaultTileProvider)]] Parameters {
         // User-facing name of this tile provider
         std::optional<std::string> name;
 
+        // Identifier of the enclosing layer to which tiles are provided
+        std::optional<std::string> identifier;
+
         // The path to the file that is loaded by GDAL to produce tiles. Since GDAL
         // supports it, this can also be the textual representation of the contents of a
         // loading file
@@ -70,6 +85,32 @@ namespace {
         // Determines if the tiles should be preprocessed before uploading to the GPU
         std::optional<bool> performPreProcessing;
 
+        struct CacheSettings {
+            // Specifies whether to use caching or not
+            std::optional<bool> enabled;
+
+            // [[codegen::verbatim(CompressionInfo.description)]]
+            enum class [[codegen::map(Compression)]] Compression {
+                PNG = 0,
+                JPEG,
+                LERC
+            };
+
+            // The compression algorithm to use for cached tiles
+            std::optional<Compression> compression;
+
+            // The quality setting of the compression alogrithm, only valid for JPEG
+            std::optional<int> quality [[codegen::inrange(0, 100)]];
+
+            // The block-size of the MRF cache
+            std::optional<int> blockSize [[codegen::greater(0)]];
+        };
+        // Specifies the cache settings that should be applied to this layer
+        std::optional<CacheSettings> cacheSettings;
+
+        // The name of the enclosing globe
+        std::optional<std::string> globeName;
+
     };
 #include "defaulttileprovider_codegen.cpp"
 } // namespace
@@ -105,17 +146,53 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
     _performPreProcessing = _layerGroupID == layers::Group::ID::HeightLayers;
     _performPreProcessing = p.performPreProcessing.value_or(_performPreProcessing);
 
+    // Get the name of the layergroup to which this layer belongs
+    auto it = std::find_if(
+        layers::Groups.begin(),
+        layers::Groups.end(),
+        [id = _layerGroupID](const layers::Group& gi) {
+            return gi.id == id;
+        }
+    );
+    auto layerGroup = it != layers::Groups.end() ? it->name : std::to_string(static_cast<int>(_layerGroupID));
+
+    std::string identifier = p.identifier.value_or("unspecified");
+    std::string enclosing = p.globeName.value_or("unspecified");
+
+    std::string path = fmt::format("{}/{}/{}/", enclosing, layerGroup, identifier);
+
+    GlobeBrowsingModule& module = *global::moduleEngine->module<GlobeBrowsingModule>();
+    bool enabled = module.isMRFCachingEnabled();
+    Compression compression =
+        _layerGroupID == layers::Group::ID::HeightLayers ? Compression::LERC : Compression::JPEG;
+    int quality = 75;
+    int blockSize = 1024;
+    if (p.cacheSettings.has_value()) {
+        enabled = p.cacheSettings->enabled.value_or(enabled);
+        if (p.cacheSettings->compression.has_value()) {
+            compression = codegen::map<Compression>(*p.cacheSettings->compression);
+        }
+        quality = p.cacheSettings->quality.value_or(quality);
+        blockSize = p.cacheSettings->blockSize.value_or(blockSize);
+    }
+
+    _cacheProperties.enabled = enabled;
+    _cacheProperties.path = path;
+    _cacheProperties.quality = quality;
+    _cacheProperties.blockSize = blockSize;
+    _cacheProperties.compression = codegen::toString(compression);
+
     TileTextureInitData initData(
         tileTextureInitData(_layerGroupID, _padTiles, pixelSize)
     );
     _tilePixelSize = initData.dimensions.x;
-    initAsyncTileDataReader(initData);
+    initAsyncTileDataReader(initData, _cacheProperties);
 
     addProperty(_filePath);
     addProperty(_tilePixelSize);
 }
 
-void DefaultTileProvider::initAsyncTileDataReader(TileTextureInitData initData) {
+void DefaultTileProvider::initAsyncTileDataReader(TileTextureInitData initData, TileCacheProperties cacheProperties) {
     ZoneScoped;
 
     _asyncTextureDataProvider = std::make_unique<AsyncTileDataProvider>(
@@ -123,6 +200,7 @@ void DefaultTileProvider::initAsyncTileDataReader(TileTextureInitData initData)
         std::make_unique<RawTileDataReader>(
             _filePath,
             initData,
+            cacheProperties,
             RawTileDataReader::PerformPreprocessing(_performPreProcessing)
         )
     );
@@ -189,7 +267,8 @@ void DefaultTileProvider::update() {
 
     if (_asyncTextureDataProvider->shouldBeDeleted()) {
         initAsyncTileDataReader(
-            tileTextureInitData(_layerGroupID, _padTiles, _tilePixelSize)
+            tileTextureInitData(_layerGroupID, _padTiles, _tilePixelSize),
+            _cacheProperties
         );
     }
 }
diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.h b/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
index 60b96fe6bf..21b659296d 100644
--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.h
@@ -26,7 +26,7 @@
 #define __OPENSPACE_MODULE_GLOBEBROWSING___TILEPROVIDER__DEFAULTTILEPROVIDER___H__
 
 #include <modules/globebrowsing/src/tileprovider/tileprovider.h>
-
+#include <modules/globebrowsing/src/tilecacheproperties.h>
 #include <modules/globebrowsing/src/asynctiledataprovider.h>
 #include <memory>
 
@@ -48,7 +48,7 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    void initAsyncTileDataReader(TileTextureInitData initData);
+    void initAsyncTileDataReader(TileTextureInitData initData, TileCacheProperties cacheProperties);
 
     properties::StringProperty _filePath;
     properties::IntProperty _tilePixelSize;
@@ -57,6 +57,7 @@ private:
     layers::Group::ID _layerGroupID = layers::Group::ID::Unknown;
     bool _performPreProcessing = false;
     bool _padTiles = true;
+    TileCacheProperties _cacheProperties;
 };
 
 } // namespace openspace::globebrowsing
diff --git a/modules/imgui/src/guiactioncomponent.cpp b/modules/imgui/src/guiactioncomponent.cpp
index 7c47b3f088..a9bb377201 100644
--- a/modules/imgui/src/guiactioncomponent.cpp
+++ b/modules/imgui/src/guiactioncomponent.cpp
@@ -64,7 +64,7 @@ void GuiActionComponent::render() {
 
         const interaction::Action& a = global::actionManager->action(p.second);
         ImGui::Text("%s", a.documentation.c_str());
-        if (!a.synchronization) {
+        if (a.isLocal) {
             ImGui::SameLine();
             ImGui::Text("(%s)", "local");
         }
@@ -86,7 +86,7 @@ void GuiActionComponent::render() {
         ImGui::SetCursorPosX(350.f);
 
         ImGui::Text("%s", action.documentation.c_str());
-        if (!action.synchronization) {
+        if (action.isLocal) {
             ImGui::SameLine();
             ImGui::Text("(%s)", "local");
         }
diff --git a/modules/iswa/shaders/dataplane_fs.glsl b/modules/iswa/shaders/dataplane_fs.glsl
index 88b239f21c..8076a78f03 100644
--- a/modules/iswa/shaders/dataplane_fs.glsl
+++ b/modules/iswa/shaders/dataplane_fs.glsl
@@ -54,7 +54,7 @@ Fragment getFragment() {
         v += texture(textures[i], vs_st).r;
       }
       v /= numTextures;
-      
+
       vec4 color = texture(transferFunctions[0], vec2(v, 0.0));
       if ((v < (x + y)) && v > (x - y)) {
         diffuse = Transparent;
diff --git a/modules/iswa/shaders/dataplane_vs.glsl b/modules/iswa/shaders/dataplane_vs.glsl
index 396429bdfe..09ca68d6b4 100644
--- a/modules/iswa/shaders/dataplane_vs.glsl
+++ b/modules/iswa/shaders/dataplane_vs.glsl
@@ -42,7 +42,7 @@ void main() {
 
   vs_position = tmp;
   vs_st = in_st;
-  
+
   position = ViewProjection * position;
   gl_Position =  z_normalization(position);
 }
diff --git a/modules/iswa/shaders/datasphere_fs.glsl b/modules/iswa/shaders/datasphere_fs.glsl
index c94f815909..54d336454d 100644
--- a/modules/iswa/shaders/datasphere_fs.glsl
+++ b/modules/iswa/shaders/datasphere_fs.glsl
@@ -47,14 +47,14 @@ Fragment getFragment() {
 
   float x = backgroundValues.x;
   float y = backgroundValues.y;
-  
+
   if ((numTransferFunctions == 1) || (numTextures > numTransferFunctions)) {
     float v = 0;
     for (int i = 0; i < numTextures; i++) {
       v += texture(textures[i], vec2(vs_st.t, vs_st.s)).r;
     }
     v /= numTextures;
-    
+
     vec4 color = texture(transferFunctions[0], vec2(v, 0.0));
     if ((v < (x + y)) && v > (x - y)) {
       color = mix(Transparent, color, clamp(1.0, 0.0, abs(v - x)));
diff --git a/modules/iswa/shaders/datasphere_vs.glsl b/modules/iswa/shaders/datasphere_vs.glsl
index fbd39a753c..2cfbcc93e4 100644
--- a/modules/iswa/shaders/datasphere_vs.glsl
+++ b/modules/iswa/shaders/datasphere_vs.glsl
@@ -43,7 +43,7 @@ void main() {
 
   // this is wrong for the normal. The normal transform is the transposed inverse of the model transform
   // vs_normal = normalize(ModelTransform * vec4(in_normal,0));
-  
+
   vec4 position = pscTransform(tmp, ModelTransform);
   vs_position = tmp;
   position = ViewProjection * position;
diff --git a/modules/iswa/shaders/textureplane_vs.glsl b/modules/iswa/shaders/textureplane_vs.glsl
index fc429dc3c5..e31de12e26 100644
--- a/modules/iswa/shaders/textureplane_vs.glsl
+++ b/modules/iswa/shaders/textureplane_vs.glsl
@@ -42,7 +42,7 @@ void main() {
 
   vs_position = tmp;
   vs_st = in_st;
-  
+
   position = ViewProjection * position;
   gl_Position =  z_normalization(position);
 }
diff --git a/modules/kameleonvolume/CMakeLists.txt b/modules/kameleonvolume/CMakeLists.txt
index 7d475fb2a4..e4931f2065 100644
--- a/modules/kameleonvolume/CMakeLists.txt
+++ b/modules/kameleonvolume/CMakeLists.txt
@@ -17,7 +17,7 @@
 # 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   # 
+# 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.                                          #
 ##########################################################################################
diff --git a/modules/multiresvolume/shaders/bounds_vs.glsl b/modules/multiresvolume/shaders/bounds_vs.glsl
index 3052fc615d..8f5650bc34 100644
--- a/modules/multiresvolume/shaders/bounds_vs.glsl
+++ b/modules/multiresvolume/shaders/bounds_vs.glsl
@@ -21,7 +21,7 @@
  * 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"
@@ -40,7 +40,7 @@ void main() {
 
     worldPosition = vec4(vertPosition.xyz, 0.0);
     vec4 position = pscTransform(worldPosition, modelTransform);
-    
+
     // project the position to view space
     gl_Position =  z_normalization(viewProjection * position);
 }
diff --git a/modules/multiresvolume/shaders/raycast.glsl b/modules/multiresvolume/shaders/raycast.glsl
index ce54a9f79f..e9bb14c4c1 100644
--- a/modules/multiresvolume/shaders/raycast.glsl
+++ b/modules/multiresvolume/shaders/raycast.glsl
@@ -80,12 +80,12 @@ float stepSize#{id}(vec3 samplePos, vec3 dir) {
     }
 }
 
-void sample#{id}(vec3 samplePos, vec3 dir, inout vec3 accumulatedColor, 
+void sample#{id}(vec3 samplePos, vec3 dir, inout vec3 accumulatedColor,
                  inout vec3 accumulatedAlpha, inout float maxStepSize)
 {
     //vec4 sample#{id}(vec3 samplePos, vec3 dir, vec4 foregroundColor, inout float maxStepSize) {
     //return vec4(1.0, 1.0, 1.0, 1.0);
-    
+
     if (true /*opacity_#{id} >= MULTIRES_OPACITY_THRESHOLD*/) {
         if (gridType_#{id} == 1) {
             samplePos = multires_cartesianToSpherical(samplePos);
diff --git a/modules/server/src/topics/shortcuttopic.cpp b/modules/server/src/topics/shortcuttopic.cpp
index db2eab047a..4125257635 100644
--- a/modules/server/src/topics/shortcuttopic.cpp
+++ b/modules/server/src/topics/shortcuttopic.cpp
@@ -59,7 +59,7 @@ std::vector<nlohmann::json> ShortcutTopic::shortcutsJson() const {
             { "identifier", action.identifier },
             { "name", action.name },
             { "script", action.command },
-            { "synchronization", static_cast<bool>(action.synchronization) },
+            { "synchronization", static_cast<bool>(!action.isLocal) },
             { "documentation", action.documentation },
             { "guiPath", action.guiPath },
         };
diff --git a/modules/skybrowser/include/screenspaceskybrowser.h b/modules/skybrowser/include/screenspaceskybrowser.h
index dd0a7ed772..9a59fb5d35 100644
--- a/modules/skybrowser/include/screenspaceskybrowser.h
+++ b/modules/skybrowser/include/screenspaceskybrowser.h
@@ -46,7 +46,7 @@ public:
     void render() override;
     void update() override;
 
-    float opacity() const;
+    float opacity() const noexcept;
     glm::dvec2 fineTuneVector(const glm::dvec2& drag);
     bool isInitialized() const;
     bool isPointingSpacecraft() const;
diff --git a/modules/skybrowser/shaders/target_vs.glsl b/modules/skybrowser/shaders/target_vs.glsl
index a249d6af40..a395ea0e5b 100644
--- a/modules/skybrowser/shaders/target_vs.glsl
+++ b/modules/skybrowser/shaders/target_vs.glsl
@@ -21,7 +21,7 @@
  * 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"
diff --git a/modules/skybrowser/skybrowsermodule_lua.inl b/modules/skybrowser/skybrowsermodule_lua.inl
index 2d64d4c423..c018cdca4a 100644
--- a/modules/skybrowser/skybrowsermodule_lua.inl
+++ b/modules/skybrowser/skybrowsermodule_lua.inl
@@ -454,7 +454,7 @@ std::string prunedIdentifier(std::string identifier) {
  * Takes an identifier to a sky browser or sky target, an index to an image and a value
  * for the opacity.
  */
-[[codegen::luawrap]] void setOpacityOfImageLayer(std::string identifier, 
+[[codegen::luawrap]] void setOpacityOfImageLayer(std::string identifier,
                                                  std::string imageUrl, float opacity)
 {
     using namespace openspace;
diff --git a/modules/skybrowser/src/browser.cpp b/modules/skybrowser/src/browser.cpp
index 206fcfeca7..e9e6671277 100644
--- a/modules/skybrowser/src/browser.cpp
+++ b/modules/skybrowser/src/browser.cpp
@@ -124,7 +124,7 @@ void Browser::initializeGL() {
 
     _browserInstance->initialize();
     _browserInstance->loadUrl(_url);
-    // Update the dimensions upon initialization. Do this with flag as it affects 
+    // Update the dimensions upon initialization. Do this with flag as it affects
     // derived classes as well
     _isDimensionsDirty = true;
 }
diff --git a/modules/skybrowser/src/screenspaceskybrowser.cpp b/modules/skybrowser/src/screenspaceskybrowser.cpp
index 85cf3c6eab..0eb7bee4e4 100644
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -377,7 +377,7 @@ void ScreenSpaceSkyBrowser::setOpacity(float opacity) {
     _opacity = opacity;
 }
 
-float ScreenSpaceSkyBrowser::opacity() const {
+float ScreenSpaceSkyBrowser::opacity() const noexcept {
     return _opacity;
 }
 
diff --git a/modules/skybrowser/src/targetbrowserpair.cpp b/modules/skybrowser/src/targetbrowserpair.cpp
index a946e6f737..90672f5856 100644
--- a/modules/skybrowser/src/targetbrowserpair.cpp
+++ b/modules/skybrowser/src/targetbrowserpair.cpp
@@ -164,7 +164,7 @@ ghoul::Dictionary TargetBrowserPair::dataAsDictionary() 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();
         ghoul_assert(imageExists, "Image doesn't exist in the wwt catalog!");
@@ -303,7 +303,7 @@ void TargetBrowserPair::incrementallyAnimateToCoordinate() {
         _targetIsAnimating = false;
         _fovIsAnimating = true;
     }
-    // After the target has animated to its position, animate the field of view 
+    // After the target has animated to its position, animate the field of view
     if (_fovAnimation.isAnimating()) {
         _browser->setVerticalFov(_fovAnimation.newValue());
         _targetRenderable->setVerticalFov(_browser->verticalFov());
diff --git a/modules/skybrowser/src/wwtcommunicator.cpp b/modules/skybrowser/src/wwtcommunicator.cpp
index a02daeb31a..66f7cb41d1 100644
--- a/modules/skybrowser/src/wwtcommunicator.cpp
+++ b/modules/skybrowser/src/wwtcommunicator.cpp
@@ -278,13 +278,13 @@ bool WwtCommunicator::isImageCollectionLoaded() const {
 }
 
 SelectedImageDeque::iterator WwtCommunicator::findSelectedImage(
-                                                              const std::string& imageUrl) 
+                                                              const std::string& imageUrl)
 {
     auto it = std::find_if(
         _selectedImages.begin(),
         _selectedImages.end(),
-        [imageUrl](const std::pair<std::string, double>& pair) { 
-            return pair.first == imageUrl; 
+        [imageUrl](const std::pair<std::string, double>& pair) {
+            return pair.first == imageUrl;
         }
     );
     return it;
diff --git a/modules/skybrowser/src/wwtdatahandler.cpp b/modules/skybrowser/src/wwtdatahandler.cpp
index a465eb4ab7..7ef139bdb9 100644
--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -171,7 +171,7 @@ namespace {
         return true;
     }
 
-    std::optional<openspace::ImageData> 
+    std::optional<openspace::ImageData>
     loadImageFromNode(const tinyxml2::XMLElement* node, const std::string& collection)
     {
         using namespace openspace;
diff --git a/modules/space/labelscomponent.cpp b/modules/space/labelscomponent.cpp
index 60e912c93a..5682ab117d 100644
--- a/modules/space/labelscomponent.cpp
+++ b/modules/space/labelscomponent.cpp
@@ -39,19 +39,19 @@ namespace {
     constexpr int RenderOptionFaceCamera = 0;
     constexpr int RenderOptionPositionNormal = 1;
 
+    constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
+        "Enabled",
+        "Is Enabled",
+        "This setting determines whether the labels will be visible or not. They are "
+        "disabled per default"
+    };
+
     constexpr openspace::properties::Property::PropertyInfo FileInfo = {
         "File",
         "File",
         "The speck label file with the data for the labels"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
-        "Opacity",
-        "Opacity",
-        "Determines the transparency of the labels, where 1 is completely opaque "
-        "and 0 fully transparent"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
         "Color",
         "Color",
@@ -83,11 +83,20 @@ namespace {
         "display rendering (for example fisheye) this should be set to false."
     };
 
+    constexpr openspace::properties::Property::PropertyInfo TransformationMatrixInfo = {
+        "TransformationMatrix",
+        "Transformation Matrix",
+        "Transformation matrix to be applied to the labels"
+    };
+
     struct [[codegen::Dictionary(LabelsComponent)]] Parameters {
+        // [[codegen::verbatim(EnabledInfo.description)]]
+        std::optional<bool> enabled;
+
         // [[codegen::verbatim(FileInfo.description)]]
         std::filesystem::path file;
 
-        // [[codegen::verbatim(OpacityInfo.description)]]
+        // The opacity of the labels
         std::optional<float> opacity [[codegen::inrange(0.0, 1.0)]];
 
         // [[codegen::verbatim(ColorInfo.description)]]
@@ -115,6 +124,9 @@ namespace {
 
         // [[codegen::verbatim(FaceCameraInfo.description)]]
         std::optional<bool> faceCamera;
+
+        // [[codegen::verbatim(TransformationMatrixInfo.description)]]
+        std::optional<glm::dmat4x4> transformationMatrix;
     };
 #include "labelscomponent_codegen.cpp"
 } // namespace
@@ -127,7 +139,7 @@ documentation::Documentation LabelsComponent::Documentation() {
 
 LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner({ "Labels" })
-    , _opacity(OpacityInfo, 1.f, 0.f, 1.f)
+    , _enabled(EnabledInfo, false)
     , _color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _size(SizeInfo, 8.f, 0.5f, 24.f)
     , _fontSize(FontSizeInfo, 50.f, 1.f, 300.f)
@@ -150,9 +162,14 @@ LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary)
         _unit = DistanceUnit::Meter;
     }
 
+    _enabled = p.enabled.value_or(_enabled);
+    addProperty(_enabled);
+
     _opacity = p.opacity.value_or(_opacity);
     addProperty(_opacity);
 
+    addProperty(_fade);
+
     _color = p.color.value_or(_color);
     _color.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_color);
@@ -184,6 +201,8 @@ LabelsComponent::LabelsComponent(const ghoul::Dictionary& dictionary)
         _faceCamera = !global::windowDelegate->isFisheyeRendering();
     }
     addProperty(_faceCamera);
+
+    _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 }
 
 speck::Labelset& LabelsComponent::labelSet() {
@@ -212,11 +231,18 @@ bool LabelsComponent::isReady() const {
     return !(_labelset.entries.empty());
 }
 
+bool LabelsComponent::enabled() const {
+    return _enabled;
+}
+
 void LabelsComponent::render(const RenderData& data,
                              const glm::dmat4& modelViewProjectionMatrix,
                              const glm::vec3& orthoRight, const glm::vec3& orthoUp,
                              float fadeInVariable)
 {
+    if (!_enabled) {
+        return;
+    }
     float scale = static_cast<float>(toMeter(_unit));
 
     int renderOption = _faceCamera ? RenderOptionFaceCamera : RenderOptionPositionNormal;
@@ -234,15 +260,18 @@ void LabelsComponent::render(const RenderData& data,
     labelInfo.enableDepth = true;
     labelInfo.enableFalseDepth = false;
 
-    glm::vec4 textColor = glm::vec4(glm::vec3(_color), _opacity * fadeInVariable);
+    glm::vec4 textColor = glm::vec4(glm::vec3(_color), opacity() * fadeInVariable);
 
     for (const speck::Labelset::Entry& e : _labelset.entries) {
         if (!e.isEnabled) {
             continue;
         }
 
-        glm::vec3 scaledPos(e.position);
+        // Transform and scale the labels
+        glm::vec3 transformedPos(_transformationMatrix * glm::dvec4(e.position, 1.0));
+        glm::vec3 scaledPos(transformedPos);
         scaledPos *= scale;
+
         ghoul::fontrendering::FontRenderer::defaultProjectionRenderer().render(
             *_font,
             scaledPos,
diff --git a/modules/space/labelscomponent.h b/modules/space/labelscomponent.h
index 6e9aad5a81..9d8759fa7f 100644
--- a/modules/space/labelscomponent.h
+++ b/modules/space/labelscomponent.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_MODULE_SPACE___LABELSCOMPONENT___H__
 
 #include <openspace/properties/propertyowner.h>
+#include <openspace/rendering/fadeable.h>
 
 #include <modules/space/speckloader.h>
 #include <openspace/properties/scalar/boolproperty.h>
@@ -43,7 +44,7 @@ struct RenderData;
 
 namespace documentation { struct Documentation; }
 
-class LabelsComponent : public properties::PropertyOwner {
+class LabelsComponent : public properties::PropertyOwner, public Fadeable {
 public:
     explicit LabelsComponent(const ghoul::Dictionary& dictionary);
     ~LabelsComponent() override = default;
@@ -56,6 +57,7 @@ public:
     void loadLabels();
 
     bool isReady() const;
+    bool enabled() const;
 
     void render(const RenderData& data, const glm::dmat4& modelViewProjectionMatrix,
         const glm::vec3& orthoRight, const glm::vec3& orthoUp,
@@ -70,8 +72,10 @@ private:
 
     std::shared_ptr<ghoul::fontrendering::Font> _font = nullptr;
 
+    glm::dmat4 _transformationMatrix = glm::dmat4(1.0);
+
     // Properties
-    properties::FloatProperty _opacity;
+    properties::BoolProperty _enabled;
     properties::Vec3Property _color;
     properties::FloatProperty _size;
     properties::FloatProperty _fontSize;
diff --git a/modules/space/rendering/renderableconstellationsbase.cpp b/modules/space/rendering/renderableconstellationsbase.cpp
index f6d5d87d16..f791badbca 100644
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -51,12 +51,6 @@ namespace {
         "The line width of the constellation"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo DrawLabelInfo = {
-        "DrawLabels",
-        "Draw Labels",
-        "Determines whether labels should be drawn or hidden"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo SelectionInfo = {
         "ConstellationSelection",
         "Constellation Selection",
@@ -70,9 +64,6 @@ namespace {
     };
 
     struct [[codegen::Dictionary(RenderableConstellationsBase)]] Parameters {
-        // [[codegen::verbatim(DrawLabelInfo.description)]]
-        std::optional<bool> drawLabels;
-
         // [[codegen::verbatim(NamesFileInfo.description)]]
         std::optional<std::filesystem::path> namesFile;
 
@@ -100,13 +91,11 @@ RenderableConstellationsBase::RenderableConstellationsBase(
     : Renderable(dictionary)
     , _lineWidth(LineWidthInfo, 2.f, 1.f, 16.f)
     , _selection(SelectionInfo)
-    , _drawLabels(DrawLabelInfo, false)
     , _namesFilename(NamesFileInfo)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     // Avoid reading files here, instead do it in multithreaded initialize()
     if (p.namesFile.has_value()) {
@@ -119,12 +108,11 @@ RenderableConstellationsBase::RenderableConstellationsBase(
     addProperty(_lineWidth);
 
     if (p.labels.has_value()) {
-        _drawLabels = p.drawLabels.value_or(_drawLabels);
-        addProperty(_drawLabels);
-
         _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);
     }
 
     _selection.onChange([this]() { selectionPropertyHasChanged(); });
@@ -218,7 +206,7 @@ bool RenderableConstellationsBase::isReady() const {
 }
 
 void RenderableConstellationsBase::render(const RenderData& data, RendererTasks&) {
-    if (!_hasLabels || !_drawLabels) {
+    if (!_hasLabels || !_labels->enabled()) {
         return;
     }
 
diff --git a/modules/space/rendering/renderableconstellationsbase.h b/modules/space/rendering/renderableconstellationsbase.h
index e942fd528d..13a013dfd2 100644
--- a/modules/space/rendering/renderableconstellationsbase.h
+++ b/modules/space/rendering/renderableconstellationsbase.h
@@ -85,7 +85,6 @@ protected:
 
     // Labels
     bool _hasLabels = false;
-    properties::BoolProperty _drawLabels;
     // Everything related to the labels is handled by LabelsComponent
     std::unique_ptr<LabelsComponent> _labels;
 
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 0c55c86114..d9601b2cd0 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -541,7 +541,6 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _dataMapping.bvColor = p.dataMapping.bv.value_or("");
     _dataMapping.bvColor.onChange([this]() { _dataIsDirty = true; });
diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp
index 8813c15a4d..8004fcaf7a 100644
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -259,7 +259,7 @@ void RenderableTravelSpeed::update(const UpdateData& data) {
     }
 
     _targetPosition = _targetNode->worldPosition();
-    SceneGraphNode* mySGNPointer = _parent;
+    SceneGraphNode* mySGNPointer = parent();
     ghoul_assert(mySGNPointer, "Renderable have to be owned by scene graph node");
     _sourcePosition = mySGNPointer->worldPosition();
 
diff --git a/modules/space/shaders/convolution_fs.glsl b/modules/space/shaders/convolution_fs.glsl
index 53ba366fba..ca1ff4f734 100644
--- a/modules/space/shaders/convolution_fs.glsl
+++ b/modules/space/shaders/convolution_fs.glsl
@@ -36,7 +36,7 @@ uniform sampler2D shapeTexture;
 
 void main() {
   float fullColor = 0.0;
-  
+
   float maxConvSize = float(psfTextureSize);
   float convStep = 1.0 / maxConvSize;
   float textureStep = 1.0 / float(convolvedfTextureSize);
diff --git a/modules/space/shaders/debrisViz_fs.glsl b/modules/space/shaders/debrisViz_fs.glsl
index e5b164f25c..31c0db4235 100644
--- a/modules/space/shaders/debrisViz_fs.glsl
+++ b/modules/space/shaders/debrisViz_fs.glsl
@@ -40,12 +40,12 @@ Fragment getFragment() {
   // vertices. We want vertexDistance to be double up to this point, I think, (hence the
   // unnessesary float to float conversion)
   float vertexDistance = periodFraction - offsetPeriods;
-  
-  // This is the alternative way of calculating 
+
+  // This is the alternative way of calculating
   // the offsetPeriods: (vertexID_perOrbit/nrOfSegments_f)
   // float vertexID_perOrbit = mod(vertexID_f, numberOfSegments);
   // float nrOfSegments_f = float(numberOfSegments);
-  // float vertexDistance = periodFraction - (vertexID_perOrbit/nrOfSegments_f); 
+  // float vertexDistance = periodFraction - (vertexID_perOrbit/nrOfSegments_f);
 
   if (vertexDistance < 0.0) {
     vertexDistance += 1.0;
diff --git a/modules/space/shaders/debrisViz_vs.glsl b/modules/space/shaders/debrisViz_vs.glsl
index ff76079d97..601a33316a 100644
--- a/modules/space/shaders/debrisViz_vs.glsl
+++ b/modules/space/shaders/debrisViz_vs.glsl
@@ -26,7 +26,7 @@
 
 #include "PowerScaling/powerScalingMath.hglsl"
 
-layout (location = 0) in vec4 vertexData; // 1: x, 2: y, 3: z, 4: timeOffset, 
+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;
diff --git a/modules/space/shaders/psfToTexture_fs.glsl b/modules/space/shaders/psfToTexture_fs.glsl
index 75edb42d9d..8d914d9dd0 100644
--- a/modules/space/shaders/psfToTexture_fs.glsl
+++ b/modules/space/shaders/psfToTexture_fs.glsl
@@ -42,7 +42,7 @@ const int PsfMethodMoffat = 1;
 
 void main() {
   vec4 fullColor = vec4(0.0, 0.0, 0.0, 1.0);
-  if (psfMethod == PsfMethodSpencer) { 
+  if (psfMethod == PsfMethodSpencer) {
     // PSF Functions from paper: Physically-Based Galre Effects for Digital
     // Images - Spencer, Shirley, Zimmerman and Greenberg.
     float theta = sqrt((psfCoords.y * psfCoords.y + psfCoords.x * psfCoords.x)) * 90.0;
@@ -59,10 +59,10 @@ void main() {
     float moffat = pow(1.0 + (r/alpha) * (r/alpha), -betaConstant);
     fullColor = vec4(moffat);
   }
-  
+
   if (fullColor.a == 0) {
     discard;
   }
-  
+
   renderTableColor = fullColor;
 }
diff --git a/modules/space/shaders/rings_fs.glsl b/modules/space/shaders/rings_fs.glsl
index e7c294c2df..eaf78692bf 100644
--- a/modules/space/shaders/rings_fs.glsl
+++ b/modules/space/shaders/rings_fs.glsl
@@ -58,7 +58,7 @@ Fragment getFragment() {
   if (texCoord < 0.0 || texCoord > 1.0) {
     discard;
   }
-      
+
   vec4 diffuse = texture(texture1, texCoord);
   // divided by 3 as length of vec3(1.0, 1.0, 1.0) will return 3 and we want
   // to normalize the alpha value to [0,1]
diff --git a/modules/space/shaders/star_fs.glsl b/modules/space/shaders/star_fs.glsl
index a2864ac811..45360a1434 100644
--- a/modules/space/shaders/star_fs.glsl
+++ b/modules/space/shaders/star_fs.glsl
@@ -42,7 +42,7 @@ uniform bool filterOutOfRange;
 
 // keep in sync with renderablestars.h:ColorOption enum
 const int ColorOptionColor = 0;
-const int ColorOptionVelocity = 1; 
+const int ColorOptionVelocity = 1;
 const int ColorOptionSpeed = 2;
 const int ColorOptionOtherData = 3;
 const int ColorOptionFixedColor = 4;
@@ -69,7 +69,7 @@ vec4 otherDataValue() {
 Fragment getFragment() {
   vec4 color = vec4(0.0);
   switch (colorOption) {
-    case ColorOptionColor: 
+    case ColorOptionColor:
       color = bv2rgb(ge_bv);
       break;
     case ColorOptionVelocity:
@@ -94,7 +94,7 @@ Fragment getFragment() {
 
   vec4 textureColor = texture(psfTexture, texCoords);
   vec4 fullColor = vec4(color.rgb, textureColor.a * alphaValue);
-  
+
   if (fullColor.a < 0.001) {
     discard;
   }
@@ -105,6 +105,6 @@ Fragment getFragment() {
   frag.gPosition = vec4(vs_position, 1.0);
   frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
   frag.disableLDR2HDR = true;
-  
+
   return frag;
 }
diff --git a/modules/space/shaders/star_ge.glsl b/modules/space/shaders/star_ge.glsl
index e8458747a9..4e3cba08fa 100644
--- a/modules/space/shaders/star_ge.glsl
+++ b/modules/space/shaders/star_ge.glsl
@@ -110,14 +110,14 @@ double scaleForAbsoluteMagnitude(float absMagnitude) {
 double scaleForApparentMagnitude(dvec3 dpos, float absMag) {
   double distanceToStarInMeters = length(dpos - eyePosition);
   double distanceToCenterInMeters = length(eyePosition);
-  float distanceToStarInParsecs = float(distanceToStarInMeters/PARSEC); 
+  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);// * 
+
+  //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);
@@ -134,7 +134,7 @@ double scaleForDistanceModulus(float absMag) {
 void main() {
   vec3 pos = gl_in[0].gl_Position.xyz;
   vs_position = pos; // in object space
-  dvec4 dpos  = modelMatrix * dvec4(pos, 1.0); 
+  dvec4 dpos  = modelMatrix * dvec4(pos, 1.0);
 
   ge_bv = vs_bvLumAbsMagAppMag[0].x;
   ge_velocity = vs_velocity[0];
@@ -173,7 +173,7 @@ void main() {
   }
   else if (psfParamConf == SizeCompositionOptionLumSizeDistanceModulus) {
     float absMagnitude = vs_bvLumAbsMagAppMag[0].z;
-    
+
     scaleMultiply = scaleForDistanceModulus(absMagnitude);
   }
 
@@ -182,30 +182,30 @@ void main() {
   dvec3 newUp = normalize(cross(normal, newRight));
   dvec3 scaledRight = scaleMultiply * newRight;
   dvec3 scaledUp = scaleMultiply * newUp;
-  
+
   vec4 lowerLeft = z_normalization(
     vec4(cameraViewProjectionMatrix * dvec4(dpos.xyz - scaledRight - scaledUp, dpos.w))
   );
-  
+
   vec4 upperRight = z_normalization(
     vec4(cameraViewProjectionMatrix * dvec4(dpos.xyz + scaledUp + scaledRight, dpos.w))
-  ); 
+  );
 
   vec4 lowerRight = z_normalization(
     vec4(cameraViewProjectionMatrix * dvec4(dpos.xyz + scaledRight - scaledUp, dpos.w))
   );
-  
+
   vec4 upperLeft = z_normalization(
     vec4(cameraViewProjectionMatrix * dvec4(dpos.xyz + scaledUp - scaledRight, dpos.w))
   );
 
   gs_screenSpaceDepth = lowerLeft.w;
 
-  // Build primitive    
+  // Build primitive
   gl_Position = lowerLeft;
   texCoords = vec2(0.0, 0.0);
   EmitVertex();
-  
+
   gl_Position = lowerRight;
   texCoords = vec2(1.0,0.0);
   EmitVertex();
@@ -213,10 +213,10 @@ void main() {
   gl_Position = upperLeft;
   texCoords = vec2(0.0, 1.0);
   EmitVertex();
-  
+
   gl_Position = upperRight;
   texCoords = vec2(1.0, 1.0);
   EmitVertex();
-  
+
   EndPrimitive();
 }
diff --git a/modules/space/shaders/travelspeed_fs.glsl b/modules/space/shaders/travelspeed_fs.glsl
index ccafe094ab..e74e11a9ba 100644
--- a/modules/space/shaders/travelspeed_fs.glsl
+++ b/modules/space/shaders/travelspeed_fs.glsl
@@ -21,7 +21,7 @@
  * 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"
  #include "floatoperations.glsl"
 
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index 8e0fa9172e..c548d6d01e 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -161,7 +161,6 @@ RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dict
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
-    registerUpdateRenderBinFromOpacity();
 
     _numberOfPoints = p.numberOfPoints.value_or(_numberOfPoints);
     addProperty(_numberOfPoints);
diff --git a/modules/spacecraftinstruments/scripts/crawl_rosetta_images/crawl_rosetta_images.js b/modules/spacecraftinstruments/scripts/crawl_rosetta_images/crawl_rosetta_images.js
index 0176f14bfe..961364a7b1 100644
--- a/modules/spacecraftinstruments/scripts/crawl_rosetta_images/crawl_rosetta_images.js
+++ b/modules/spacecraftinstruments/scripts/crawl_rosetta_images/crawl_rosetta_images.js
@@ -80,14 +80,14 @@ getHttps(archiveUrl, (body) => {
     let imageUrl = '';
     if (thumbnailName) {
       let originalName = thumbnailName.replace('_tn', '');
-      imageUrl = rootUrl + originalName; 
+      imageUrl = rootUrl + originalName;
     }
 
 
     let detailsName = $(td).find('a').attr('href');
     if (detailsName) {
       let detailsUrl = rootUrl + detailsName;
-      
+
       getHttps(detailsUrl, (detailsBody) => {
         let $detailsRoot = $.load(detailsBody);
 
@@ -99,7 +99,7 @@ getHttps(archiveUrl, (body) => {
         $detailsRoot('tr').map((i, detailsTr) => {
           let header = $(detailsTr).children('th').html();
           let cell = $(detailsTr).children('td').html();
-          
+
           switch (header) {
             case 'ID': id = cell; break;
             case 'Date taken': startTime = cell; break;
diff --git a/modules/spacecraftinstruments/shaders/fov_vs.glsl b/modules/spacecraftinstruments/shaders/fov_vs.glsl
index 04d8a47d0d..9d62bf358e 100644
--- a/modules/spacecraftinstruments/shaders/fov_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/fov_vs.glsl
@@ -60,7 +60,7 @@ void main() {
   gl_Position = pos;
 
   vec3 color;
-  switch (colorInformation) { 
+  switch (colorInformation) {
     case VertexColorTypeDefaultStart:
       vs_color = vec4(colorStart, 1.0);
       break;
diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
index b4b25ae41f..1bb8255e1e 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
@@ -40,7 +40,7 @@ uniform vec3 boresight;
 
 bool inRange(float x, float a, float b) {
   return (x >= a && x <= b);
-} 
+}
 
 
 void main() {
diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
index 80a91fac74..e3732da719 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
@@ -45,6 +45,6 @@ void main() {
   vs_normal = normalize(ModelTransform * meshNormalTransform * vec4(in_normal, 0.0));
   vs_ndc = position / position.w;
 
-  vec2 texco = (in_st * 2.0) - 1.0; 
+  vec2 texco = (in_st * 2.0) - 1.0;
   gl_Position = vec4(texco, 0.0, 1.0);
 }
diff --git a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
index 2a9fd56ccc..6ed9b41adc 100644
--- a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
@@ -62,7 +62,7 @@ Fragment getFragment() {
       projectionFading * projectionColor.a
     );
   }
-  
+
   vec3 diffuseAlbedo = textureColor.rgb;
 
   Fragment frag;
@@ -70,7 +70,7 @@ Fragment getFragment() {
     // Some of these values could be passed in as uniforms
     const vec3 lightColorAmbient = vec3(1.0);
     const vec3 lightColor = vec3(1.0);
-    
+
     vec3 n = normalize(vs_normalViewSpace);
     vec3 l = directionToSunViewSpace;
     vec3 c = normalize(vs_positionCameraSpace.xyz);
@@ -80,7 +80,7 @@ Fragment getFragment() {
     float specularCosineFactor = dot(c,r);
 
     vec3 ambientColor = ambientIntensity * lightColorAmbient * diffuseAlbedo;
-    vec3 diffuseColor = 
+    vec3 diffuseColor =
         diffuseIntensity * lightColor * diffuseAlbedo * max(diffuseCosineFactor, 0.0);
     vec3 specularColor = specularIntensity * lightColor * specularAlbedo *
         pow(max(specularCosineFactor, 0.0), specularPower);
diff --git a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
index dcf4cf3b7a..b2a2e26c30 100644
--- a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
@@ -51,7 +51,7 @@ void main() {
   vec4 p = z_normalization(positionClipSpace);
   vs_depth = p.w;
   gl_Position = p;
-  
+
   // The normal transform should be the transposed inverse of the model transform?
   vs_normalViewSpace = normalize(
     mat3(modelViewTransform) * (mat3(meshNormalTransform) * in_normal)
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
index f323bdffb0..5eb98ea72a 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
@@ -28,7 +28,7 @@
 
 in vec2 vs_position;
 
-layout (location = 0) out vec4 color; 
+layout (location = 0) out vec4 color;
 layout (location = 1) out vec4 stencil;
 
 uniform sampler2D projectionTexture;
@@ -51,13 +51,13 @@ vec4 uvToModel(vec2 uv, vec3 radius, float segments) {
   float x = radius.x * sin(theta) * cos(phi);
   float y = radius.y * sin(theta) * sin(phi);
   float z = radius.z * cos(theta);
-  
+
   return vec4(x, y, z, 0.0);
 }
 
 bool inRange(float x, float a, float b) {
   return (x >= a && x <= b);
-} 
+}
 
 
 void main() {
@@ -81,7 +81,7 @@ void main() {
       dot(v_b, normal) < 0.0)
   {
     color = texture(projectionTexture, vec2(projected.x, projected.y));
-    stencil = vec4(1.0); 
+    stencil = vec4(1.0);
   }
   else {
     color = vec4(0.0);
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
index d9322c8be7..8925ff01ae 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
@@ -46,11 +46,11 @@ void main() {
   vs_st = in_st;
 
   vec3 tmp = in_position.xyz;
-  
-  // This is wrong for the normal. 
+
+  // This is wrong for the normal.
   // The normal transform is the transposed inverse of the model transform
   vs_normal = normalize(modelTransform * vec4(in_normal, 0.0)).xyz;
-  
+
   if (hasHeightMap) {
     vec2 st = vs_st;
     if (meridianShift) {
diff --git a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
index fc3f0b5af1..0b9c43a496 100644
--- a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
@@ -42,7 +42,7 @@ void main() {
   else {
     vs_color = vec3(0.0);
   }
-  
+
   // Transform the damn psc to homogenous coordinate
   vec4 position = vec4(in_point_position.xyz * pow(10, in_point_position.w), 1.0);
   vec4 positionClipSpace = modelViewProjectionTransform * position;
diff --git a/modules/toyvolume/shaders/bounds_vs.glsl b/modules/toyvolume/shaders/bounds_vs.glsl
index 3bb2aef19a..bd61697e12 100644
--- a/modules/toyvolume/shaders/bounds_vs.glsl
+++ b/modules/toyvolume/shaders/bounds_vs.glsl
@@ -21,7 +21,7 @@
  * 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 vertPosition;
@@ -36,7 +36,7 @@ uniform mat4 modelViewTransform;
 void main() {
     modelPosition = vertPosition.xyz;
     viewPosition = modelViewTransform*vertPosition;
-    
+
     // project the position to view space
     gl_Position = projectionTransform * viewPosition;
     gl_Position.z = 1.0;
diff --git a/modules/toyvolume/shaders/raycast.glsl b/modules/toyvolume/shaders/raycast.glsl
index c33c3c03fc..66faa16211 100644
--- a/modules/toyvolume/shaders/raycast.glsl
+++ b/modules/toyvolume/shaders/raycast.glsl
@@ -60,7 +60,7 @@ void sample#{id}(vec3 samplePos, vec3 dir, inout vec3 accumulatedColor,
 
     backColor = clamp(backColor, 0.0, 1.0);
     backAlpha = clamp(backAlpha, 0.0, 1.0);
-    
+
     vec3 oneMinusFrontAlpha = vec3(1.0) - accumulatedAlpha;
     accumulatedColor += oneMinusFrontAlpha * backColor;
     accumulatedAlpha += oneMinusFrontAlpha * backAlpha;
diff --git a/modules/volume/shaders/bounds_vs.glsl b/modules/volume/shaders/bounds_vs.glsl
index 76fd110043..cf93a6b7bb 100644
--- a/modules/volume/shaders/bounds_vs.glsl
+++ b/modules/volume/shaders/bounds_vs.glsl
@@ -21,7 +21,7 @@
  * 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"
@@ -41,6 +41,6 @@ void main() {
 
   vec4 positionClipSpace = projectionTransform * positionCameraSpace;
   vec4 positionScreenSpace = z_normalization(positionClipSpace);
-    
+
   gl_Position = positionScreenSpace;
 }
diff --git a/modules/webbrowser/cmake/patch/cmake/cef_variables.cmake b/modules/webbrowser/cmake/patch/cmake/cef_variables.cmake
index ab9dc9754c..0271a8c89b 100644
--- a/modules/webbrowser/cmake/patch/cmake/cef_variables.cmake
+++ b/modules/webbrowser/cmake/patch/cmake/cef_variables.cmake
@@ -59,7 +59,7 @@ set(CEF_LIBCEF_DLL_WRAPPER_PATH "${_CEF_ROOT}/libcef_dll")
 
 # Shared compiler/linker flags.
 list(APPEND CEF_COMPILER_DEFINES
-  # Allow C++ programs to use stdint.h macros specified in the C99 standard that aren't 
+  # Allow C++ programs to use stdint.h macros specified in the C99 standard that aren't
   # in the C++ standard (e.g. UINT8_MAX, INT64_MIN, etc)
   __STDC_CONSTANT_MACROS __STDC_FORMAT_MACROS
   )
diff --git a/modules/webbrowser/cmake/webbrowser_helpers.cmake b/modules/webbrowser/cmake/webbrowser_helpers.cmake
index 0b606022dd..67fb45768e 100644
--- a/modules/webbrowser/cmake/webbrowser_helpers.cmake
+++ b/modules/webbrowser/cmake/webbrowser_helpers.cmake
@@ -160,7 +160,7 @@ function(run_cef_linux_config CEF_TARGET CEF_ROOT)
 endfunction ()
 
 function(set_modules_dependency_on_cef_libraries LIB_DEPENDENT)
-  target_link_libraries(${LIB_DEPENDENT} INTERFACE libcef_lib) 
+  target_link_libraries(${LIB_DEPENDENT} INTERFACE libcef_lib)
   target_link_libraries(${LIB_DEPENDENT} INTERFACE libcef_dll_wrapper)
 endfunction ()
 
diff --git a/openspace.cfg b/openspace.cfg
index cec2e9cafa..5ba0ee4aca 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -137,12 +137,9 @@ Paths = {
 
 ModuleConfigurations = {
     GlobeBrowsing = {
-        WMSCacheEnabled = false,
-        -- OfflineMode = true,
-        -- NoWarning = true,
-        WMSCacheLocation = "${BASE}/cache_gdal",
-        WMSCacheSize = 1024, -- in megabytes PER DATASET
-        TileCacheSize = 2048 -- for all globes (CPU and GPU memory)
+        TileCacheSize = 2048, -- for all globes (CPU and GPU memory)
+        MRFCacheEnabled = false,
+        MRFCacheLocation = "${BASE}/mrf_cache"
     },
     Sync = {
         SynchronizationRoot = "${SYNC}",
@@ -237,6 +234,7 @@ LoadingScreen = {
 CheckOpenGLState = false
 LogEachOpenGLCall = false
 PrintEvents = false
+ConsoleKey = "GRAVEACCENT"
 
 ShutdownCountdown = 3
 ScreenshotUseDate = true
diff --git a/scripts/drag_drop_handler.lua b/scripts/drag_drop_handler.lua
index c6becc7219..e1b58c7473 100644
--- a/scripts/drag_drop_handler.lua
+++ b/scripts/drag_drop_handler.lua
@@ -32,10 +32,9 @@ end
 local ReloadUIScript = [[ if openspace.hasProperty('Modules.CefWebGui.Reload') then openspace.setPropertyValue('Modules.CefWebGui.Reload', nil) end ]]
 
 if is_image_file(extension) then
-  identifier = basename_without_extension:gsub(" ", "_")
-  identifier = identifier:gsub("%p", "_") -- replace all punctuation characters with '_'
-  return [[openspace.addScreenSpaceRenderable({
-    Identifier = "]] .. identifier .. [[",
+  return [[
+  openspace.addScreenSpaceRenderable({
+    Identifier = openspace.makeIdentifier("]] .. basename_without_extension .. [["),
     Type = "ScreenSpaceImageLocal",
     TexturePath = "]] .. filename .. [["
   });]] .. ReloadUIScript
diff --git a/shaders/PowerScaling/powerScalingMath.hglsl b/shaders/PowerScaling/powerScalingMath.hglsl
index 8eb3c63b05..24dde9f6d3 100644
--- a/shaders/PowerScaling/powerScalingMath.hglsl
+++ b/shaders/PowerScaling/powerScalingMath.hglsl
@@ -29,8 +29,8 @@
 const float k = 10.0;
 const float FLT_MAX = 1e38; // Not max but large enough for the purpose
 
-float log10(float x) {  
-  return log(x) / log(10.0);   
+float log10(float x) {
+  return log(x) / log(10.0);
 }
 
 vec4 psc_normalization(vec4 v) {
diff --git a/shaders/PowerScaling/powerScaling_vs.hglsl b/shaders/PowerScaling/powerScaling_vs.hglsl
index 6918e3d320..45b0aacb43 100644
--- a/shaders/PowerScaling/powerScaling_vs.hglsl
+++ b/shaders/PowerScaling/powerScaling_vs.hglsl
@@ -40,13 +40,13 @@ vec4 psc_to_meter(vec4 v1, vec2 v2) {
 // vertexPosition is returned as the transformed vertex in OS Camera Rig Space in PSC
 vec4 pscTransform(inout vec4 vertexPosition, mat4 modelTransform) {
   vec3 local_vertex_pos = mat3(modelTransform) * vertexPosition.xyz;
-    
+
   // PSC addition; local vertex position and the object power scaled world position
   vertexPosition = psc_addition(vec4(local_vertex_pos,vertexPosition.w),objpos);
-    
+
   // PSC addition; rotated and viewscaled vertex and the cameras negative position
   vertexPosition = psc_addition(vertexPosition,vec4(-campos.xyz,campos.w));
-    
+
   // rotate the camera
   vertexPosition.xyz =  mat3(camrot) * vertexPosition.xyz;
   vec4 tmp = vertexPosition;
@@ -58,10 +58,10 @@ vec4 pscTransform(inout vec4 vertexPosition, mat4 modelTransform) {
   else {
     vertexPosition = vec4(vertexPosition.xyz * scaling.x * pow(k, scaling.y), vertexPosition.w);
   }
-    
+
   // project using the rescaled coordinates,
   tmp = psc_to_meter(tmp, scaling);
-    
+
   // Return the vertex tranformed to OS Camera Rig Space in meters
   return tmp;
 }
diff --git a/shaders/floatoperations.glsl b/shaders/floatoperations.glsl
index 1f25c1c8cf..722dd135a7 100644
--- a/shaders/floatoperations.glsl
+++ b/shaders/floatoperations.glsl
@@ -53,7 +53,7 @@ float denormalizeFloat(float inpt) {
 /**
  * Compute the length of a vector.
  * Supporting huge vectors, where the square of any of the components is too large to be
- * represented as a float. 
+ * represented as a float.
  */
 float safeLength(vec4 v) {
   float m = max(max(max(abs(v.x), abs(v.y)), abs(v.z)), abs(v.w));
diff --git a/shaders/framebuffer/fxaa.frag b/shaders/framebuffer/fxaa.frag
index 66a7130086..06f85a6d84 100644
--- a/shaders/framebuffer/fxaa.frag
+++ b/shaders/framebuffer/fxaa.frag
@@ -24,14 +24,14 @@
 
 #version __CONTEXT__
 
-#define EDGE_THRESHOLD_MIN 0.0312f 
+#define EDGE_THRESHOLD_MIN 0.0312f
 #define EDGE_THRESHOLD_MAX 0.125f
 #define ITERATIONS 12
 #define SUBPIXEL_QUALITY 0.75f
 
 const float[12] QUALITY = float[](1.f, 1.f, 1.f, 1.f, 1.f, 1.5f, 2.f, 2.f, 2.f, 2.f, 4.f, 8.f);
 // const float[24] QUALITY = {2.f, 4.f, 6.f, 8.f, 10.f, 12.f, 12.f, 12.f, 12.f, 12.f, 14.f, 18.f,
-//                             18.f, 18.f, 18.f, 18.f, 18.f, 18.f, 18.f, 18.f, 18.f, 18.f, 
+//                             18.f, 18.f, 18.f, 18.f, 18.f, 18.f, 18.f, 18.f, 18.f, 18.f,
 //                             18.f, 18.f};
 
 in vec2 texCoord;
@@ -67,7 +67,7 @@ void main() {
   float pixelLumUp     = getLum(textureOffset(renderedTexture, st, ivec2(0,1)).rgb);
   float pixelLumLeft   = getLum(textureOffset(renderedTexture, st, ivec2(-1,0)).rgb);
   float pixelLumRight  = getLum(textureOffset(renderedTexture, st, ivec2(1,0)).rgb);
-    
+
   float pixelLumMin = min(pixelLumCenter, min(min(pixelLumDown, pixelLumUp), min(pixelLumLeft, pixelLumRight)));
   float pixelLumMax = max(pixelLumCenter, max(max(pixelLumDown, pixelLumUp), max(pixelLumLeft, pixelLumRight)));
 
@@ -95,16 +95,16 @@ void main() {
   float pixelLumUpCorners = pixelLumUpRight + pixelLumUpLeft;
 
   // Compute an estimation of the gradient
-  float edgeHorizontal = abs(-2.0 * pixelLumLeft + pixelLumLeftCorners) + 
+  float edgeHorizontal = abs(-2.0 * pixelLumLeft + pixelLumLeftCorners) +
     abs(-2.0 * pixelLumCenter + pixelLumDownUp) * 2.0 + abs(-2.0 * pixelLumRight + pixelLumRightCorners);
-  float edgeVertical = abs(-2.0 * pixelLumUp + pixelLumUpCorners) + 
+  float edgeVertical = abs(-2.0 * pixelLumUp + pixelLumUpCorners) +
     abs(-2.0 * pixelLumCenter + pixelLumLeftRight) * 2.0  + abs(-2.0 * pixelLumDown + pixelLumDownCorners);
 
   // Choosing Edge Orientation
   bool isHorizontal = (edgeHorizontal >= edgeVertical);
   float pixelLum1  = isHorizontal ? pixelLumDown : pixelLumLeft;
   float pixelLum2  = isHorizontal ? pixelLumUp : pixelLumRight;
-    
+
   // Gradients
   float gradient1 = pixelLum1 - pixelLumCenter;
   float gradient2 = pixelLum2 - pixelLumCenter;
@@ -137,11 +137,11 @@ void main() {
   vec2 offset = isHorizontal ?
     vec2(inverseScreenSize.x, 0.0) :
     vec2(0.0, inverseScreenSize.y);
-    
+
   vec2 uv1 = currentUv - offset;
   vec2 uv2 = currentUv + offset;
 
-  // Read the pixelLums at both current extremities of the exploration segment, 
+  // Read the pixelLums at both current extremities of the exploration segment,
   // and compute the delta wrt to the local average pixelLum.
   float pixelLumEnd1 = getLum(texture(renderedTexture, uv1).rgb);
   float pixelLumEnd2 = getLum(texture(renderedTexture, uv2).rgb);
@@ -158,7 +158,7 @@ void main() {
 
   if (!reached2) {
     uv2 += offset;
-  }   
+  }
 
   // Still exploring
   if (!reachedBoth) {
@@ -187,7 +187,7 @@ void main() {
       }
 
       // If both sides have been reached
-      if (reachedBoth) { 
+      if (reachedBoth) {
         break;
       }
     }
@@ -207,7 +207,7 @@ void main() {
 
   bool ispixelLumCenterSmaller = pixelLumCenter < pixelLumLocalAverage;
 
-  // If the pixelLum at center is smaller than at its neighbour, the delta pixelLum at 
+  // If the pixelLum at center is smaller than at its neighbour, the delta pixelLum at
   // each end should be positive (same variation).
   bool correctVariation = ((isDirection1 ? pixelLumEnd1 : pixelLumEnd2) < 0.0) != ispixelLumCenterSmaller;
 
@@ -215,9 +215,9 @@ void main() {
   float finalOffset = correctVariation ? pixelOffset : 0.0;
 
   // Subpixel antialiasing
-  float pixelLumAverage = (1.0/12.0) * (2.0 * (pixelLumDownUp + pixelLumLeftRight) + 
+  float pixelLumAverage = (1.0/12.0) * (2.0 * (pixelLumDownUp + pixelLumLeftRight) +
     pixelLumLeftCorners + pixelLumRightCorners);
-    
+
   float subPixelOffset1 = clamp(abs(pixelLumAverage - pixelLumCenter) / pixelLumRange, 0.0, 1.0);
   float subPixelOffset2 = (-2.0 * subPixelOffset1 + 3.0) * subPixelOffset1 * subPixelOffset1;
   float subPixelOffsetFinal = subPixelOffset2 * subPixelOffset2 * SUBPIXEL_QUALITY;
diff --git a/shaders/framebuffer/hdrAndFiltering.frag b/shaders/framebuffer/hdrAndFiltering.frag
index 93b7bd9347..b25214c26d 100644
--- a/shaders/framebuffer/hdrAndFiltering.frag
+++ b/shaders/framebuffer/hdrAndFiltering.frag
@@ -58,10 +58,10 @@ void main() {
 
   vec4 color = texture(hdrFeedingTexture, st);
   color.rgb *= blackoutFactor;
-    
+
   // Applies TMO
   vec3 tColor = toneMappingOperator(color.rgb, hdrExposure);
-    
+
   // Color control
   vec3 hsvColor = rgb2hsv(tColor);
   hsvColor.x = (hsvColor.x + Hue);
diff --git a/shaders/framebuffer/raycastframebuffer.frag b/shaders/framebuffer/raycastframebuffer.frag
index 64a240b97b..da1f4c00db 100644
--- a/shaders/framebuffer/raycastframebuffer.frag
+++ b/shaders/framebuffer/raycastframebuffer.frag
@@ -98,10 +98,10 @@ void main() {
   vec3 accumulatedAlpha = vec3(0.f);
 
 
-  for (nSteps = 0; 
-      (accumulatedAlpha.r < ALPHA_LIMIT || accumulatedAlpha.g < ALPHA_LIMIT || 
-       accumulatedAlpha.b < ALPHA_LIMIT) && nSteps < rayCastSteps; 
-       ++nSteps) 
+  for (nSteps = 0;
+      (accumulatedAlpha.r < ALPHA_LIMIT || accumulatedAlpha.g < ALPHA_LIMIT ||
+       accumulatedAlpha.b < ALPHA_LIMIT) && nSteps < rayCastSteps;
+       ++nSteps)
   {
     if (nextStepSize < raycastDepth / 10000000000.f) {
       break;
diff --git a/shaders/framebuffer/renderframebuffer.frag b/shaders/framebuffer/renderframebuffer.frag
index 6b62ec8eeb..bf7f209a82 100644
--- a/shaders/framebuffer/renderframebuffer.frag
+++ b/shaders/framebuffer/renderframebuffer.frag
@@ -39,18 +39,18 @@ void main() {
 
   // Color is already in HDR space
   if (f.disableLDR2HDR || (disableHDRPipeline == 1)) {
-    _out_color_ = f.color; 
+    _out_color_ = f.color;
   }
   else {
-    _out_color_ = vec4((log2(vec3(1.0) - (f.color.rgb - vec3(DeltaError)))/(-exposure)), f.color.a); 
+    _out_color_ = vec4((log2(vec3(1.0) - (f.color.rgb - vec3(DeltaError)))/(-exposure)), f.color.a);
   }
-    
+
   _out_color_.x = isnan(_out_color_.x) ? MaxValueColorBuffer : _out_color_.x;
   _out_color_.y = isnan(_out_color_.y) ? MaxValueColorBuffer : _out_color_.y;
   _out_color_.z = isnan(_out_color_.z) ? MaxValueColorBuffer : _out_color_.z;
-    
+
   gPosition = f.gPosition;
   gNormal = f.gNormal;
-     
+
   gl_FragDepth = normalizeFloat(f.depth);
 }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4c8d61a145..17118f7297 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -125,6 +125,7 @@ set(OPENSPACE_SOURCE
   rendering/dashboardtextitem.cpp
   rendering/framebufferrenderer.cpp
   rendering/deferredcastermanager.cpp
+  rendering/fadeable.cpp
   rendering/helper.cpp
   rendering/loadingscreen.cpp
   rendering/luaconsole.cpp
@@ -313,6 +314,7 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/deferredcaster.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/deferredcasterlistener.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/deferredcastermanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/fadeable.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/loadingscreen.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/luaconsole.h
   ${PROJECT_SOURCE_DIR}/include/openspace/rendering/helper.h
diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index f5ba040530..3b66777c4c 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -158,7 +158,6 @@ void logError(const SpecificationError& error, std::string component) {
     }
     else {
         LERRORC(fmt::format("{}: {}", component, error.component), error.message);
-        
     }
     for (const documentation::TestResult::Offense& o : error.result.offenses) {
         LERRORC(
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index 9f610d37e1..1712c61b02 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -254,6 +254,10 @@ namespace {
         // the OpenSpaceEngine with the same name
         std::optional<bool> printEvents;
 
+        /// Determines which key opens the in-game console. The value passed in must be a
+        /// valid key (see keys.h for a list)
+        std::optional<std::string> consoleKey;
+
         // This value determines whether the initialization of the scene graph should
         // occur multithreaded, that is, whether multiple scene graph nodes should
         // initialize in parallel. The only use for this value is to disable it for
@@ -352,6 +356,19 @@ void parseLuaState(Configuration& configuration) {
     c.isCheckingOpenGLState = p.checkOpenGLState.value_or(c.isCheckingOpenGLState);
     c.isLoggingOpenGLCalls = p.logEachOpenGLCall.value_or(c.isLoggingOpenGLCalls);
     c.isPrintingEvents = p.printEvents.value_or(c.isPrintingEvents);
+
+    if (p.consoleKey.has_value()) {
+        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",
+                *p.consoleKey
+            ));
+        }
+
+        c.consoleKey = km.key;
+    }
+
     c.shutdownCountdown = p.shutdownCountdown.value_or(c.shutdownCountdown);
     c.shouldUseScreenshotDate = p.screenshotUseDate.value_or(c.shouldUseScreenshotDate);
     c.onScreenTextScaling = p.onScreenTextScaling.value_or(c.onScreenTextScaling);
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 74a956a502..13b3f532d9 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -134,6 +134,15 @@ namespace {
         "If checked, hidden scene graph nodes are visible in the UI"
     };
 
+    constexpr openspace::properties::Property::PropertyInfo FadeDurationInfo = {
+        "FadeDuration",
+        "Fade Duration (seconds)",
+        "Controls how long time the fading in/out takes when enabling/disabling an "
+        "object through a checkbox in the UI. Holding SHIFT while clicking the "
+        "checkbox will enable/disable the renderable without fading, as will setting "
+        "this value to zero."
+    };
+
     constexpr openspace::properties::Property::PropertyInfo DisableMouseInputInfo = {
         "DisableMouseInputs",
         "Disable All Mouse Inputs",
@@ -151,6 +160,7 @@ OpenSpaceEngine::OpenSpaceEngine()
     , _printEvents(PrintEventsInfo, false)
     , _visibility(VisibilityInfo)
     , _showHiddenSceneGraphNodes(ShowHiddenSceneInfo, false)
+    , _fadeOnEnableDuration(FadeDurationInfo, 1.f, 0.f, 5.f)
     , _disableAllMouseInputs(DisableMouseInputInfo, false)
 {
     FactoryManager::initialize();
@@ -160,6 +170,7 @@ OpenSpaceEngine::OpenSpaceEngine()
     addProperty(_printEvents);
     addProperty(_visibility);
     addProperty(_showHiddenSceneGraphNodes);
+    addProperty(_fadeOnEnableDuration);
     addProperty(_disableAllMouseInputs);
 
     using Visibility = openspace::properties::Property::Visibility;
@@ -470,6 +481,7 @@ void OpenSpaceEngine::initializeGL() {
     LTRACE("OpenSpaceEngine::initializeGL::Console::initialize(begin)");
     try {
         global::luaConsole->initialize();
+        global::luaConsole->setCommandInputButton(global::configuration->consoleKey);
     }
     catch (ghoul::RuntimeError& e) {
         LERROR("Error initializing Console with error:");
@@ -1811,7 +1823,7 @@ void setActionsFromProfile(const Profile& p) {
         action.name = a.name;
         action.documentation = a.documentation;
         action.guiPath = a.guiPath;
-        action.synchronization = interaction::Action::IsSynchronized(a.isLocal);
+        action.isLocal = interaction::Action::IsLocal(a.isLocal);
         global::actionManager->registerAction(std::move(action));
     }
 }
diff --git a/src/interaction/actionmanager.cpp b/src/interaction/actionmanager.cpp
index f00c5fb4bd..fb8e4fe904 100644
--- a/src/interaction/actionmanager.cpp
+++ b/src/interaction/actionmanager.cpp
@@ -96,13 +96,13 @@ void ActionManager::triggerAction(const std::string& identifier,
     if (arguments.isEmpty()) {
         global::scriptEngine->queueScript(
             a.command,
-            scripting::ScriptEngine::RemoteScripting(a.synchronization)
+            scripting::ScriptEngine::RemoteScripting(!a.isLocal)
         );
     }
     else {
         global::scriptEngine->queueScript(
             fmt::format("args = {}\n{}", ghoul::formatLua(arguments), a.command),
-            scripting::ScriptEngine::RemoteScripting(a.synchronization)
+            scripting::ScriptEngine::RemoteScripting(!a.isLocal)
         );
     }
 }
diff --git a/src/interaction/actionmanager_lua.inl b/src/interaction/actionmanager_lua.inl
index 4a10d51ae9..7e55b3fdb7 100644
--- a/src/interaction/actionmanager_lua.inl
+++ b/src/interaction/actionmanager_lua.inl
@@ -120,7 +120,7 @@ struct [[codegen::Dictionary(Action)]] Action {
         throw ghoul::RuntimeError("Action's GuiPath must start with /");
     }
     if (action.isLocal.has_value()) {
-        a.synchronization = interaction::Action::IsSynchronized(*action.isLocal);
+        a.isLocal = interaction::Action::IsLocal(*action.isLocal);
     }
     global::actionManager->registerAction(std::move(a));
 }
@@ -148,10 +148,7 @@ struct [[codegen::Dictionary(Action)]] Action {
     res.setValue("Name", action.name);
     res.setValue("Documentation", action.documentation);
     res.setValue("GuiPath", action.guiPath);
-    res.setValue(
-        "Synchronization",
-        action.synchronization == interaction::Action::IsSynchronized::Yes
-    );
+    res.setValue("IsLocal", action.isLocal == interaction::Action::IsLocal::Yes);
     return res;
 }
 
@@ -172,11 +169,7 @@ struct [[codegen::Dictionary(Action)]] Action {
         d.setValue("Name", a.name);
         d.setValue("Documentation", a.documentation);
         d.setValue("GuiPath", a.guiPath);
-        d.setValue(
-            "Synchronization",
-            a.synchronization == interaction::Action::IsSynchronized::Yes
-        );
-
+        d.setValue("IsLocal", a.isLocal == interaction::Action::IsLocal::Yes);
         res.push_back(d);
     }
     return res;
diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index e0c193d772..3e67369240 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -74,7 +74,7 @@ NSArray* focusIdentifiers;
 
         // Set the default ordering of items.
         touchBar.defaultItemIdentifiers = objs;
-            
+
         touchBar.customizationAllowedItemIdentifiers = objs;
         if ([focusIdentifiers count] > 0) {
             touchBar.principalItemIdentifier = [focusIdentifiers firstObject];
@@ -90,7 +90,7 @@ NSArray* focusIdentifiers;
         (void)touchBar;
 
         if ([identifier isEqualToString:pauseResultId]) {
-            NSButton* button = [NSButton 
+            NSButton* button = [NSButton
                 buttonWithTitle:NSLocalizedString(
                     (global::timeManager->isPaused() ? @"Resume" : @"Pause"),
                     @""
@@ -112,7 +112,7 @@ NSArray* focusIdentifiers;
         }
 
         if ([identifier isEqualToString:hideOnScreenTextId]) {
-            NSButton* button = [NSButton 
+            NSButton* button = [NSButton
                 buttonWithTitle:@"Toggle Text"
                 target:self action:@selector(hideTextAction:)
             ];
@@ -241,7 +241,7 @@ void showTouchbar() {
         g_TouchBarDelegate = [[TouchBarDelegate alloc] init];
         [NSApplication sharedApplication].automaticCustomizeTouchBarMenuItemEnabled = YES;
     }
-    
+
     std::vector<SceneGraphNode*> ns = global::renderEngine->scene()->allSceneGraphNodes();
 
     std::sort(
diff --git a/src/navigation/path.cpp b/src/navigation/path.cpp
index ecadff6d0d..95a7f51830 100644
--- a/src/navigation/path.cpp
+++ b/src/navigation/path.cpp
@@ -192,7 +192,7 @@ bool Path::hasReachedEnd() const {
         return true;
     }
 
-    // @TODO (emmbr, 2022-11-07) Handle linear paths separately, as they might 
+    // @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;
diff --git a/src/navigation/pathnavigator_lua.inl b/src/navigation/pathnavigator_lua.inl
index 26d3e79bce..989d07fbb1 100644
--- a/src/navigation/pathnavigator_lua.inl
+++ b/src/navigation/pathnavigator_lua.inl
@@ -84,16 +84,16 @@ namespace {
         }
         else {
             double d = std::get<double>(*useUpFromTargetOrDuration);
-            if (d <= 0.0) {
-                throw ghoul::lua::LuaError("Duration must be larger than zero");
+            if (d < 0.0) {
+                throw ghoul::lua::LuaError("Duration must be a positive value");
             }
             insDict.setValue("Duration", d);
         }
     }
     if (duration.has_value()) {
         double d = *duration;
-        if (d <= 0.0) {
-            throw ghoul::lua::LuaError("Duration must be larger than zero");
+        if (d < 0.0) {
+            throw ghoul::lua::LuaError("Duration must be a positive value");
         }
         insDict.setValue("Duration", d);
     }
@@ -134,16 +134,16 @@ namespace {
         }
         else {
             double d = std::get<double>(*useUpFromTargetOrDuration);
-            if (d <= 0.0) {
-                throw ghoul::lua::LuaError("Duration must be larger than zero");
+            if (d < 0.0) {
+                throw ghoul::lua::LuaError("Duration must be a positive value");
             }
             insDict.setValue("Duration", d);
         }
     }
     if (duration.has_value()) {
         double d = *duration;
-        if (d <= 0.0) {
-            throw ghoul::lua::LuaError("Duration must be larger than zero");
+        if (d < 0.0) {
+            throw ghoul::lua::LuaError("Duration must be a positive value");
         }
         insDict.setValue("Duration", d);
     }
@@ -182,8 +182,8 @@ namespace {
 
     if (duration.has_value()) {
         double d = *duration;
-        if (d <= 0.0) {
-            throw ghoul::lua::LuaError("Duration must be larger than zero");
+        if (d < 0.0) {
+            throw ghoul::lua::LuaError("Duration must be a positive value");
         }
         instruction.setValue("Duration", d);
     }
@@ -213,8 +213,8 @@ namespace {
 
     if (duration.has_value()) {
         double d = *duration;
-        if (d <= 0.0) {
-            throw ghoul::lua::LuaError("Duration must be larger than zero");
+        if (d < 0.0) {
+            throw ghoul::lua::LuaError("Duration must be a positive value");
         }
         insDict.setValue("Duration", d);
     }
@@ -251,8 +251,8 @@ namespace {
 
     if (duration.has_value()) {
         double d = *duration;
-        if (d <= 0.0) {
-            throw ghoul::lua::LuaError("Duration must be larger than zero");
+        if (d < 0.0) {
+            throw ghoul::lua::LuaError("Duration must be a positive value");
         }
         insDict.setValue("Duration", d);
     }
@@ -294,8 +294,8 @@ namespace {
 
     if (duration.has_value()) {
         double d = *duration;
-        if (d <= 0.0) {
-            throw ghoul::lua::LuaError("Duration must be larger than zero");
+        if (d < 0.0) {
+            throw ghoul::lua::LuaError("Duration must be a positive value");
         }
         insDict.setValue("Duration", d);
     }
diff --git a/src/rendering/fadeable.cpp b/src/rendering/fadeable.cpp
new file mode 100644
index 0000000000..a1439dc086
--- /dev/null
+++ b/src/rendering/fadeable.cpp
@@ -0,0 +1,89 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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/fadeable.h>
+
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+#include <optional>
+
+namespace {
+    constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
+        "Opacity",
+        "Opacity",
+        "This value determines the opacity of this object. A value of 0 means "
+        "completely transparent"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo FadeInfo = {
+        "Fade",
+        "Fade",
+        "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
+        openspace::properties::Property::Visibility::Hidden
+    };
+} // namespace
+
+namespace openspace {
+
+Fadeable::Fadeable()
+    : _opacity(OpacityInfo, 1.f, 0.f, 1.f)
+    , _fade(FadeInfo, 1.f, 0.f, 1.f)
+{
+    // Note that this is not a property owner. It's still up to the subclasses to
+    // add the properties, assign values, etc.
+}
+
+void Fadeable::setFade(float fade) {
+    _fade = fade;
+}
+
+void Fadeable::setParentFadeable(Fadeable* parent) {
+    _parentFadeable = parent;
+}
+
+float Fadeable::fade() const {
+    return _fade;
+}
+
+bool Fadeable::isVisible() const {
+    return opacity() > 0.f;
+}
+
+float Fadeable::opacity() const noexcept {
+    float fadeFromParent = 1.f;
+    if (_parentFadeable) {
+        // Note that we only care about the fade here, not the full opacity of the
+        // parent. A subowner might still be visible even if the opacity of the 
+        // parent is set to zero
+        fadeFromParent = _parentFadeable->fade();
+    }
+    return _opacity * _fade * fadeFromParent;
+}
+
+}  // namespace openspace
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index 3c2404ec48..b7d97d74b2 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -54,8 +54,6 @@ namespace {
 
     constexpr uint64_t CurrentVersion = 0xFEEE'FEEE'0000'0001;
 
-    constexpr openspace::Key CommandInputButton = openspace::Key::GraveAccent;
-
     constexpr std::string_view FontName = "Console";
     constexpr float EntryFontSize = 14.0f;
     constexpr float HistoryFontSize = 11.0f;
@@ -274,7 +272,7 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
         return false;
     }
 
-    if (key == CommandInputButton) {
+    if (key == _commandInputButton) {
         // Button left of 1 and above TAB
         // How to deal with different keyboard languages? ---abock
         if (_isVisible) {
@@ -580,7 +578,7 @@ void LuaConsole::charCallback(unsigned int codepoint,
         return;
     }
 
-    if (codepoint == static_cast<unsigned int>(CommandInputButton)) {
+    if (codepoint == static_cast<unsigned int>(_commandInputButton)) {
         return;
     }
 
@@ -832,6 +830,10 @@ float LuaConsole::currentHeight() const {
     return _currentHeight;
 }
 
+void LuaConsole::setCommandInputButton(Key key) {
+    _commandInputButton = key;
+}
+
 void LuaConsole::addToCommand(std::string c) {
     const size_t length = c.length();
     _commands.at(_activeCommand).insert(_inputPosition, std::move(c));
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index 83a17a07e6..8c8c15c4af 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -48,25 +48,6 @@ namespace {
         "This setting determines whether this object will be visible or not"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
-        "Opacity",
-        "Opacity",
-        "This value determines the opacity of this renderable. A value of 0 means "
-        "completely transparent"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeInfo = {
-        "Fade",
-        "Fade",
-        "This value is used by the system to be able to fade out renderables "
-        "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
-        openspace::properties::Property::Visibility::Hidden
-    };
-
     constexpr openspace::properties::Property::PropertyInfo RenderableTypeInfo = {
         "Type",
         "Renderable Type",
@@ -95,7 +76,8 @@ namespace {
         // [[codegen::verbatim(EnabledInfo.description)]]
         std::optional<bool> enabled;
 
-        // [[codegen::verbatim(OpacityInfo.description)]]
+        // This value determines the opacity of this renderable. A value of 0 means
+        // 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
@@ -153,21 +135,29 @@ ghoul::mm_unique_ptr<Renderable> Renderable::createFromDictionary(
 
 
 
-Renderable::Renderable(const ghoul::Dictionary& dictionary)
+Renderable::Renderable(const ghoul::Dictionary& dictionary, Settings settings)
     : properties::PropertyOwner({ "Renderable" })
+    , Fadeable()
     , _enabled(EnabledInfo, true)
-    , _opacity(OpacityInfo, 1.f, 0.f, 1.f)
-    , _fade(FadeInfo, 1.f, 0.f, 1.f)
     , _renderableType(RenderableTypeInfo, "Renderable")
     , _dimInAtmosphere(DimInAtmosphereInfo, false)
+    , _shouldUpdateIfDisabled(settings.shouldUpdateIfDisabled)
+    , _automaticallyUpdateRenderBin(settings.automaticallyUpdateRenderBin)
 {
     ZoneScoped;
 
-    // I can't come up with a good reason not to do this for all renderables
-    registerUpdateRenderBinFromOpacity();
-
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
+    if (p.renderBinMode.has_value()) {
+        _automaticallyUpdateRenderBin = false;
+        setRenderBin(codegen::map<Renderable::RenderBin>(*p.renderBinMode));
+    }
+
+    if (_automaticallyUpdateRenderBin) {
+        ghoul_assert(!p.renderBinMode.has_value(), "Something misfired in constructor");
+        registerUpdateRenderBinFromOpacity();
+    }
+
     if (p.tag.has_value()) {
         if (std::holds_alternative<std::string>(*p.tag)) {
             if (!std::get<std::string>(*p.tag).empty()) {
@@ -203,11 +193,6 @@ Renderable::Renderable(const ghoul::Dictionary& dictionary)
     _renderableType = p.type.value_or(_renderableType);
     addProperty(_renderableType);
 
-    // only used by a few classes such as RenderableTrail and RenderableSphere
-    if (p.renderBinMode.has_value()) {
-        setRenderBin(codegen::map<Renderable::RenderBin>(*p.renderBinMode));
-    }
-
     _dimInAtmosphere = p.dimInAtmosphere.value_or(_dimInAtmosphere);
     addProperty(_dimInAtmosphere);
 }
@@ -230,7 +215,7 @@ void Renderable::setBoundingSphere(double boundingSphere) {
     _boundingSphere = boundingSphere;
 }
 
-double Renderable::boundingSphere() const {
+double Renderable::boundingSphere() const noexcept {
     return _boundingSphere;
 }
 
@@ -238,11 +223,11 @@ void Renderable::setInteractionSphere(double interactionSphere) {
     _interactionSphere = interactionSphere;
 }
 
-double Renderable::interactionSphere() const {
+double Renderable::interactionSphere() const noexcept {
     return _interactionSphere;
 }
 
-std::string_view Renderable::typeAsString() const {
+std::string_view Renderable::typeAsString() const noexcept {
     return _renderableType;
 }
 
@@ -280,12 +265,8 @@ bool Renderable::matchesSecondaryRenderBin(int binMask) const noexcept {
     return binMask & static_cast<int>(*_secondaryRenderBin);
 }
 
-void Renderable::setFade(float fade) {
-    _fade = fade;
-}
-
 bool Renderable::isVisible() const {
-    return _enabled && _opacity > 0.f && _fade > 0.f;
+    return _enabled && Fadeable::isVisible();
 }
 
 bool Renderable::isReady() const {
@@ -296,7 +277,7 @@ bool Renderable::isEnabled() const {
     return _enabled;
 }
 
-bool Renderable::shouldUpdateIfDisabled() const {
+bool Renderable::shouldUpdateIfDisabled() const noexcept {
     return _shouldUpdateIfDisabled;
 }
 
@@ -323,15 +304,26 @@ void Renderable::setRenderBinFromOpacity() {
 void Renderable::registerUpdateRenderBinFromOpacity() {
     _opacity.onChange([this]() { setRenderBinFromOpacity(); });
     _fade.onChange([this]() { setRenderBinFromOpacity(); });
+
+    _automaticallyUpdateRenderBin = true;
 }
 
-float Renderable::opacity() const {
+float Renderable::opacity() const noexcept {
     // Rendering should depend on if camera is in the atmosphere and if camera is at the
     // dark part of the globe
     const float dimming = _dimInAtmosphere ?
         global::navigationHandler->camera()->atmosphereDimmingFactor() :
         1.f;
-    return _opacity * _fade * dimming;
+    return dimming * Fadeable::opacity();
+}
+
+SceneGraphNode* Renderable::parent() const noexcept {
+    ghoul_assert(dynamic_cast<SceneGraphNode*>(owner()), "Owner is not a SceneGraphNode");
+    return static_cast<SceneGraphNode*>(owner());
+}
+
+bool Renderable::automaticallyUpdatesRenderBin() const noexcept {
+    return _automaticallyUpdateRenderBin;
 }
 
 }  // namespace openspace
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index eb613b5579..15d5d52858 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -117,26 +117,6 @@ namespace {
         "with the background color to produce the final result"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
-        "Opacity",
-        "Opacity",
-        "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"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeInfo = {
-        "Fade",
-        "Fade",
-        "This value is used by the system to be able to fade out renderables "
-        "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
-        openspace::properties::Property::Visibility::Hidden
-    };
-
     constexpr openspace::properties::Property::PropertyInfo DeleteInfo = {
         "Delete",
         "Delete",
@@ -208,7 +188,9 @@ namespace {
         // [[codegen::verbatim(BackgroundColorInfo.description)]]
         std::optional<glm::vec4> backgroundColor [[codegen::color()]];
 
-        // [codegen::verbatim(OpacityInfo.description)]]
+        // 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
         std::optional<float> opacity [[codegen::inrange(0.f, 1.f)]];
 
         // Defines either a single or multiple tags that apply to this
@@ -293,8 +275,6 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         glm::vec4(0.f),
         glm::vec4(1.f)
     )
-    , _opacity(OpacityInfo, 1.f, 0.f, 1.f)
-    , _fade(FadeInfo, 1.f, 0.f, 1.f)
     , _delete(DeleteInfo)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
@@ -705,8 +685,4 @@ glm::vec3 ScreenSpaceRenderable::sphericalToRae(glm::vec3 spherical) const {
     );
 }
 
-
-float ScreenSpaceRenderable::opacity() const {
-    return _opacity * _fade;
-}
 } // namespace openspace
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 32a0d2f8f7..83d790b0e5 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -844,9 +844,20 @@ scripting::LuaLibrary Scene::luaLibrary() {
             codegen::lua::WorldRotation,
             codegen::lua::SetParent,
             codegen::lua::BoundingSphere,
-            codegen::lua::InteractionSphere
+            codegen::lua::InteractionSphere,
+            codegen::lua::MakeIdentifier
         }
     };
 }
 
+std::string makeIdentifier(std::string s) {
+    // 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_if(s.begin(), s.end(), std::ptr_fun<int, int>(&std::ispunct), '-');
+    std::replace(s.begin(), s.end(), ' ', '_');
+    return s;
+}
+
 }  // namespace openspace
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index 0460bc619c..cf8d768b38 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -23,6 +23,7 @@
  ****************************************************************************************/
 
 #include <openspace/engine/globals.h>
+#include <openspace/scene/scene.h>
 #include <openspace/properties/propertyowner.h>
 #include <openspace/properties/matrix/dmat2property.h>
 #include <openspace/properties/matrix/dmat3property.h>
@@ -51,6 +52,8 @@
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/properties/vector/vec4property.h>
+#include <algorithm>
+#include <cctype>
 
 namespace {
 
@@ -1004,7 +1007,7 @@ enum class [[codegen::enum]] CustomPropertyType {
 
 /**
  * Creates a new property that lives in the `UserProperty` group.
- * 
+ *
  * \param identifier The identifier that is going to be used for the new property
  * \param type The type of the property, has to be one of "DMat2Property",
  *        "DMat3Property", "DMat4Property", "Mat2Property", "Mat3Property",
@@ -1161,6 +1164,14 @@ enum class [[codegen::enum]] CustomPropertyType {
     }
 }
 
+/**
+ * Create a valid identifier from the provided input string. Will replace invalid
+ * characters like whitespaces and some punctuation marks with valid alternatives
+ */
+[[codegen::luawrap]] std::string makeIdentifier(std::string input) {
+    return openspace::makeIdentifier(input);
+}
+
 } // namespace
 
 #include "scene_lua_codegen.cpp"
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 3884fc46b7..86b17fdd09 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -74,7 +74,7 @@ namespace {
         "when interpolating"
     };
 
-    constexpr std::string_view DeltaTimeStepsKeybindsGuiPath = "/Time/Delta Time Steps";
+    constexpr std::string_view DeltaTimeStepsKeybindsGuiPath = "/Time/Simulation Speed/Steps";
 }
 
 namespace openspace {
@@ -507,9 +507,9 @@ void TimeManager::addDeltaTimesKeybindings() {
         action.documentation = fmt::format(
             "Setting the simulation speed to {} seconds per realtime second", s
         );
-        action.name = fmt::format("Set Simulation Speed: {}", s);
+        action.name = fmt::format("Set: {}", s);
         action.guiPath = DeltaTimeStepsKeybindsGuiPath;
-        action.synchronization = interaction::Action::IsSynchronized::No;
+        action.isLocal = interaction::Action::IsLocal::Yes;
         global::actionManager->registerAction(std::move(action));
         global::keybindingManager->bindKey(key, mod, std::move(identifier));
         _deltaTimeStepKeybindings.push_back(KeyWithModifier{ key, mod });
diff --git a/support/coding/check_style_guide.py b/support/coding/check_style_guide.py
index ecd1dfe52b..ca3c3266bf 100644
--- a/support/coding/check_style_guide.py
+++ b/support/coding/check_style_guide.py
@@ -201,7 +201,7 @@ def check_naming_convention_component(lines, component):
   component_part = ifndef_symbol[2:2 + len(component)]
 
   if component_part != component.upper():
-    return '#ifndef naming convention broken: ' + ifndef_symbol + ' || ' + component.upper() 
+    return '#ifndef naming convention broken: ' + ifndef_symbol + ' || ' + component.upper()
   else:
     return ''
 
@@ -246,7 +246,7 @@ def check_glm_header(lines, file):
       return ''
 
   index = [i for i,s in enumerate(lines)
-              if '#include <glm/glm.hpp>' in s or 
+              if '#include <glm/glm.hpp>' in s or
               '#include "glm/glm.hpp>"' in s]
 
   if len(index) > 0:
diff --git a/support/coding/codegen b/support/coding/codegen
index 72abde18b4..59c93dbb13 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 72abde18b40cb8490fc173bb2e8043fd43a8b48b
+Subproject commit 59c93dbb1389d607ed2e34b0c12373441b945d43
diff --git a/tests/test_documentation.cpp b/tests/test_documentation.cpp
index 4aa618087b..bae134b1b9 100644
--- a/tests/test_documentation.cpp
+++ b/tests/test_documentation.cpp
@@ -276,7 +276,7 @@ TEST_CASE("Documentation: Constructor", "[documentation]") {
 
 TEST_CASE("Documentation: Initializer Constructor", "[documentation]") {
     using namespace openspace::documentation;
-    
+
     Documentation doc {
         {
             // Basic Verifiers
@@ -1037,7 +1037,7 @@ TEST_CASE("Documentation: Optional", "[documentation]") {
     positiveRes = testSpecification(doc, positive);
     CHECK(positiveRes.success);
     CHECK(positiveRes.offenses.empty());
-    
+
     ghoul::Dictionary negative;
     TestResult negativeRes = testSpecification(doc, negative);
     CHECK_FALSE(negativeRes.success);
diff --git a/tests/test_lrucache.cpp b/tests/test_lrucache.cpp
index 05355ea0fb..5603d0c276 100644
--- a/tests/test_lrucache.cpp
+++ b/tests/test_lrucache.cpp
@@ -46,7 +46,7 @@ namespace {
         return o << key.x << ", " << key.y;
     }
 
-    // custom specialization 
+    // custom specialization
     struct DefaultHasherMyKey {
         unsigned long long operator()(const MyKey& s) const {
             return s.x ^ (s.y << 1);
diff --git a/tests/test_profile.cpp b/tests/test_profile.cpp
index 9f97f7a49e..ffe21b86c2 100644
--- a/tests/test_profile.cpp
+++ b/tests/test_profile.cpp
@@ -69,7 +69,7 @@ namespace openspace {
                lhs.name == rhs.name &&
                lhs.value == rhs.value;
     }
-    
+
     bool operator==(const openspace::Profile::Action& lhs,
                     const openspace::Profile::Action& rhs) noexcept
     {
@@ -180,7 +180,7 @@ TEST_CASE("Basic Meta (full)", "[profile]") {
 
     Profile ref;
     ref.version = Profile::CurrentVersion;
-    
+
     Profile::Meta meta;
     meta.name = "name";
     meta.version = "version";
diff --git a/tests/test_scriptscheduler.cpp b/tests/test_scriptscheduler.cpp
index 2dbcac374a..a9652c4572 100644
--- a/tests/test_scriptscheduler.cpp
+++ b/tests/test_scriptscheduler.cpp
@@ -34,7 +34,7 @@
 TEST_CASE("ScriptScheduler: Simple Forward", "[scriptscheduler]") {
     using namespace openspace;
     using namespace openspace::scripting;
-    
+
     SpiceManager::initialize();
     SpiceManager::ref().loadKernel(
         absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
diff --git a/tests/test_spicemanager.cpp b/tests/test_spicemanager.cpp
index debf12a936..44065b8a71 100644
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -91,7 +91,7 @@ namespace {
         CHECK(k9 == 9);
     }
 
-    int loadLSKKernel()  { 
+    int loadLSKKernel() {
         int kernelID = openspace::SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
         );
@@ -99,7 +99,7 @@ namespace {
         return kernelID;
     }
 
-    int loadPCKKernel()  {
+    int loadPCKKernel() {
         int kernelID = openspace::SpiceManager::ref().loadKernel(
             absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc").string()
         );
@@ -126,7 +126,7 @@ TEST_CASE("SpiceManager: Load Single Kernel", "[spicemanager]") {
         &spicemanager_constants::handle,
         &found
     );
-    
+
     CHECK(found == SPICETRUE);
 
     openspace::SpiceManager::deinitialize();
@@ -276,7 +276,7 @@ TEST_CASE("SpiceManager: Get Value From ID ND", "[spicemanager]") {
     CHECK_NOTHROW(openspace::SpiceManager::ref().getValue(target, valueND, returnND));
 
     std::vector<double> controlVec{ 189870.0, 256900.0, 9000.0, 9000.0, 0.000003 };
-    
+
     CHECK(controlVec.size() == returnND.size());
 
     for (unsigned int i = 0; i < returnND.size(); ++i){
@@ -392,7 +392,7 @@ TEST_CASE("SpiceManager: Transform matrix", "[spicemanager]") {
      stateMatrix = openspace::SpiceManager::ref().stateTransformMatrix(
         "J2000", "IAU_PHOEBE", et)
     );
-   
+
    // check for matrix consistency
    for (int i = 0; i < 6; i++) {
        for (int j = 0; j < 6; j++) {
@@ -452,7 +452,7 @@ TEST_CASE("SpiceManager: Get Position Transform Matrix", "[spicemanager]") {
 #endif
 
     position = positionMatrix * position;
-    // check transformed values match 
+    // check transformed values match
     for (int i = 0; i < 3; i++) {
         CHECK(position[i] == Catch::Approx(state_t[i]));
     }
@@ -465,7 +465,7 @@ TEST_CASE("SpiceManager: Get Field Of View", "[spicemanager]") {
 
     using openspace::SpiceManager;
     loadMetaKernel();
-    
+
     SpiceInt n;
     SpiceInt cassini_ID;
     double et;
diff --git a/tests/test_timequantizer.cpp b/tests/test_timequantizer.cpp
index 2a83989100..fb96eb018e 100644
--- a/tests/test_timequantizer.cpp
+++ b/tests/test_timequantizer.cpp
@@ -50,7 +50,7 @@ namespace {
         CHECK(t.ISO8601() == expected);
     }
 
-    void singleResolutionTest(globebrowsing::TimeQuantizer& tq, std::string resolution, 
+    void singleResolutionTest(globebrowsing::TimeQuantizer& tq, std::string resolution,
                               std::string expectedType, bool expectFailure)
     {
         std::string res;
@@ -69,7 +69,7 @@ namespace {
         }
     }
 
-    void singleStartTimeTest(globebrowsing::TimeQuantizer& tq, std::string startTime, 
+    void singleStartTimeTest(globebrowsing::TimeQuantizer& tq, std::string startTime,
                              std::string expectedErrSubstring, bool expectFailure)
     {
         std::string res;