diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3e35daafc..81d0833e7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,9 +27,9 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 project(OpenSpace)
 
 set(OPENSPACE_VERSION_MAJOR 0)
-set(OPENSPACE_VERSION_MINOR 16)
-set(OPENSPACE_VERSION_PATCH 0)
-set(OPENSPACE_VERSION_STRING "Beta-8")
+set(OPENSPACE_VERSION_MINOR 17)
+set(OPENSPACE_VERSION_PATCH -1)
+set(OPENSPACE_VERSION_STRING "Beta-10 [RC1]")
 
 set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}")
 set(OPENSPACE_CMAKE_EXT_DIR "${OPENSPACE_BASE_DIR}/support/cmake")
diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index 7622653bf6..c43e141b3f 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -116,13 +116,13 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/sgct)
 target_link_libraries(OpenSpace PRIVATE sgct)
 
 set_folder_location(sgct "External")
-set_folder_location(glfw "External/SGCT")
-set_folder_location(miniziplibstatic "External/SGCT")
-set_folder_location(png16_static "External/SGCT")
-set_folder_location(quat "External/SGCT")
-set_folder_location(tinyxml2static "External/SGCT")
-set_folder_location(vrpn "External/SGCT")
-set_folder_location(zlibstatic "External/SGCT")
+set_folder_location(glfw "External")
+set_folder_location(miniziplibstatic "External")
+set_folder_location(png16_static "External")
+set_folder_location(quat "External")
+set_folder_location(tinyxml2static "External")
+set_folder_location(vrpn "External")
+set_folder_location(zlibstatic "External")
 
 if (UNIX AND (NOT APPLE))
   target_link_libraries(OpenSpace PRIVATE Xcursor Xinerama X11)
diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index 2c1b17bb0c..508c0442cc 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -96,6 +96,7 @@ private:
     bool _shouldLaunch = false;
     int _userAssetCount = 0;
     int _userConfigCount = 0;
+    const std::string _sgctConfigName;
 
     QComboBox* _profileBox = nullptr;
     QComboBox* _windowConfigBox = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
index 6ca0c5b209..6533eff4ba 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
@@ -82,7 +82,7 @@ private:
     QLineEdit* _loadedEdit = nullptr;
     QLabel* _notLoadedLabel = nullptr;
     QLineEdit* _notLoadedEdit = nullptr;
-    
+
     QPushButton* _buttonAdd = nullptr;
     QPushButton* _buttonRemove = nullptr;
     QPushButton* _buttonSave = nullptr;
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 631c1bb27b..99672c1d57 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -141,13 +141,16 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
                                bool sgctConfigEnabled, std::string sgctConfigName,
                                QWidget* parent)
     : QMainWindow(parent)
-    , _assetPath(absPath(globalConfig.pathTokens.at("ASSETS")) + '/')
-    , _userAssetPath(absPath(globalConfig.pathTokens.at("USER_ASSETS")) + '/')
-    , _configPath(absPath(globalConfig.pathTokens.at("CONFIG")) + '/')
-    , _userConfigPath(absPath(globalConfig.pathTokens.at("USER_CONFIG")) + '/')
-    , _profilePath(absPath(globalConfig.pathTokens.at("PROFILES")) + '/')
-    , _userProfilePath(absPath(globalConfig.pathTokens.at("USER_PROFILES")) + '/')
+    , _assetPath(absPath(globalConfig.pathTokens.at("ASSETS")).string() + '/')
+    , _userAssetPath(absPath(globalConfig.pathTokens.at("USER_ASSETS")).string() + '/')
+    , _configPath(absPath(globalConfig.pathTokens.at("CONFIG")).string() + '/')
+    , _userConfigPath(absPath(globalConfig.pathTokens.at("USER_CONFIG")).string() + '/')
+    , _profilePath(absPath(globalConfig.pathTokens.at("PROFILES")).string() + '/')
+    , _userProfilePath(
+        absPath(globalConfig.pathTokens.at("USER_PROFILES")).string() + '/'
+    )
     , _readOnlyProfiles(globalConfig.readOnlyProfiles)
+    , _sgctConfigName(sgctConfigName)
 {
     Q_INIT_RESOURCE(resources);
 
@@ -175,14 +178,16 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
     populateProfilesList(globalConfig.profile);
     _profileBox->setEnabled(profileEnabled);
 
-    populateWindowConfigsList(sgctConfigName);
+    populateWindowConfigsList(_sgctConfigName);
     _windowConfigBox->setEnabled(sgctConfigEnabled);
 
 
-    std::string p = absPath(globalConfig.pathTokens.at("SYNC") + "/http/launcher_images");
+    std::filesystem::path p = absPath(
+        globalConfig.pathTokens.at("SYNC") + "/http/launcher_images"
+    );
     if (std::filesystem::exists(p)) {
         try {
-            setBackgroundImage(p);
+            setBackgroundImage(p.string());
         }
         catch (const std::exception& e) {
             std::cerr << "Error occurrred while reading background images: " << e.what();
@@ -454,7 +459,10 @@ std::string LauncherWindow::selectedProfile() const {
 }
 
 std::string LauncherWindow::selectedWindowConfig() const {
-    if (_windowConfigBox->currentIndex() > _userAssetCount) {
+    int idx = _windowConfigBox->currentIndex();
+    if (idx == 0) {
+        return _sgctConfigName;
+    } else if (idx > _userAssetCount) {
         return "${CONFIG}/" + _windowConfigBox->currentText().toStdString();
     }
     else {
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index 072022c65a..c2573cc381 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -63,7 +63,7 @@ namespace {
         int startIndex = 0;
         std::string token = "${USER_ASSETS}/";
         if (path.find(token) == 0) {
-            startIndex = token.length();
+            startIndex = static_cast<int>(token.length());
         }
         const size_t slash = path.find_first_of('/', startIndex);
         const bool endOfPath = (slash == std::string::npos);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
index baa366a879..273dde9ab6 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
@@ -460,9 +460,6 @@ void KeybindingsDialog::listItemRemove() {
 }
 
 void KeybindingsDialog::transitionToEditMode() {
-    _list->setDisabled(true);
-    _addButton->setDisabled(true);
-    _removeButton->setDisabled(true);
     _saveButton->setDisabled(true);
     _cancelButton->setDisabled(true);
     _buttonBox->setDisabled(true);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
index 5f7ad9f7f4..7359026d7e 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
@@ -297,9 +297,6 @@ void ModulesDialog::listItemRemove() {
 }
 
 void ModulesDialog::transitionToEditMode() {
-    _list->setDisabled(true);
-    _buttonAdd->setDisabled(true);
-    _buttonRemove->setDisabled(true);
     _buttonSave->setDisabled(true);
     _buttonCancel->setDisabled(true);
     _buttonBox->setDisabled(true);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
index 8e1f9477f9..3a9441154e 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
@@ -302,9 +302,6 @@ void PropertiesDialog::listItemRemove() {
 }
 
 void PropertiesDialog::transitionToEditMode() {
-    _list->setDisabled(true);
-    _addButton->setDisabled(true);
-    _removeButton->setDisabled(true);
     _saveButton->setDisabled(true);
     _cancelButton->setDisabled(true);
     _buttonBox->setDisabled(true);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
index c82fd8aa57..906a855c13 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/scriptlogdialog.cpp
@@ -39,7 +39,7 @@ ScriptlogDialog::ScriptlogDialog(QWidget* parent)
     setWindowTitle("Scriptlog");
     createWidgets();
  
-    QFile file(QString::fromStdString(absPath("${LOGS}/scriptLog.txt")));
+    QFile file(QString::fromStdString(absPath("${LOGS}/scriptLog.txt").string()));
     if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
         QTextStream in(&file);
         while (!in.atEnd()) {
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 669fbc16a9..2a3ef78f72 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 669fbc16a9910b28333427f5e07235baa43ea7a6
+Subproject commit 2a3ef78f721e919531bb05b0cedab2dabe2bb0be
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 9adc728a07..dfd8b32c52 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -61,6 +61,7 @@
 #include <Tracy.hpp>
 #include <chrono>
 #include <ctime>
+#include <filesystem>
 #include <memory>
 
 #ifdef WIN32
@@ -223,9 +224,9 @@ void mainInitFunc(GLFWwindow*) {
     //
     // We save the startup value of the screenshots just in case we want to add a date
     // to them later in the RenderEngine
-    std::string screenshotPath = absPath("${SCREENSHOTS}");
+    std::filesystem::path screenshotPath = absPath("${SCREENSHOTS}");
     FileSys.registerPathToken("${STARTUP_SCREENSHOT}", screenshotPath);
-    Settings::instance().setCapturePath(screenshotPath);
+    Settings::instance().setCapturePath(screenshotPath.string());
 
     LDEBUG("Initializing OpenSpace Engine started");
     global::openSpaceEngine->initialize();
@@ -234,11 +235,11 @@ void mainInitFunc(GLFWwindow*) {
 #ifndef __APPLE__
     // Apparently: "Cocoa: Regular windows do not have icons on macOS"
     {
-        std::string path = absPath("${DATA}/openspace-icon.png");
+        std::filesystem::path path = absPath("${DATA}/openspace-icon.png");
         int x;
         int y;
         int n;
-        unsigned char* data = stbi_load(path.c_str(), &x, &y, &n, 0);
+        unsigned char* data = stbi_load(path.string().c_str(), &x, &y, &n, 0);
 
         GLFWimage icons[1];
         icons[0].pixels = data;
@@ -975,14 +976,6 @@ std::string setWindowConfigPresetForGui(const std::string labelFromCfgFile,
     }
     else {
         preset = config.windowConfiguration;
-        if (preset.find('/') != std::string::npos) {
-            preset.erase(0, preset.find_last_of('/') + 1);
-        }
-        if (preset.length() >= xmlExt.length()) {
-            if (preset.substr(preset.length() - xmlExt.length()) == xmlExt) {
-                preset = preset.substr(0, preset.length() - xmlExt.length());
-            }
-        }
     }
     return preset;
 }
@@ -1004,7 +997,14 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
             }
         }
         else {
-            config += xmlExt;
+            if ( (config.length() >= xmlExt.length())
+                && (0 == config.compare(config.length() - xmlExt.length(), xmlExt.length(), xmlExt)) ) {
+                //user customzied sgct config
+            }
+            else {
+                config += xmlExt;
+            }
+
         }
         global::configuration->windowConfiguration = config;
     }
@@ -1039,7 +1039,7 @@ int main(int argc, char* argv[]) {
     // to make it possible to find other files in the same directory.
     FileSys.registerPathToken(
         "${BIN}",
-        ghoul::filesystem::File(absPath(argv[0])).directoryName(),
+        std::filesystem::path(argv[0]).parent_path(),
         ghoul::filesystem::FileSystem::Override::Yes
     );
 
@@ -1077,7 +1077,7 @@ int main(int argc, char* argv[]) {
 
     bool showHelp = parser.execute();
     if (showHelp) {
-        parser.displayHelp(std::cout);
+        std::cout << parser.helpText();
         exit(EXIT_SUCCESS);
     }
     // Take an actual copy of the arguments
@@ -1092,28 +1092,32 @@ int main(int argc, char* argv[]) {
     std::string windowConfiguration;
     try {
         // Find configuration
-        std::string configurationFilePath = commandlineArguments.configurationName;
-        if (commandlineArguments.configurationName.empty()) {
+        std::filesystem::path configurationFilePath;
+        if (!commandlineArguments.configurationName.empty()) {
+            configurationFilePath = absPath(commandlineArguments.configurationName);
+        }
+        else {
             LDEBUG("Finding configuration");
             configurationFilePath = configuration::findConfiguration();
         }
-        configurationFilePath = absPath(configurationFilePath);
 
-        if (!FileSys.fileExists(configurationFilePath)) {
-            LFATALC("main", "Could not find configuration: " + configurationFilePath);
+        if (!std::filesystem::is_regular_file(configurationFilePath)) {
+            LFATALC(
+                "main",
+                fmt::format("Could not find configuration {}", configurationFilePath)
+            );
             exit(EXIT_FAILURE);
         }
-        LINFO(fmt::format("Configuration Path: '{}'", configurationFilePath));
+        LINFO(fmt::format("Configuration Path: {}", configurationFilePath));
 
         // Register the base path as the directory where the configuration file lives
-        std::string base = ghoul::filesystem::File(configurationFilePath).directoryName();
-        constexpr const char* BasePathToken = "${BASE}";
-        FileSys.registerPathToken(BasePathToken, base);
+        std::filesystem::path base = configurationFilePath.parent_path();
+        FileSys.registerPathToken("${BASE}", base);
 
         // Loading configuration from disk
         LDEBUG("Loading configuration from disk");
         *global::configuration = configuration::loadConfigurationFromFile(
-            configurationFilePath,
+            configurationFilePath.string(),
             commandlineArguments.configurationOverride
         );
 
@@ -1217,7 +1221,7 @@ int main(int argc, char* argv[]) {
     // as well as the configuration file that sgct is supposed to use
     arguments.insert(arguments.begin(), argv[0]);
     arguments.insert(arguments.begin() + 1, "-config");
-    arguments.insert(arguments.begin() + 2, absPath(windowConfiguration));
+    arguments.insert(arguments.begin() + 2, absPath(windowConfiguration).string());
 
     // Need to set this before the creation of the sgct::Engine
 
@@ -1233,7 +1237,7 @@ int main(int argc, char* argv[]) {
     LDEBUG("Creating SGCT Engine");
     std::vector<std::string> arg(argv + 1, argv + argc);
     Configuration config = parseArguments(arg);
-    config::Cluster cluster = loadCluster(absPath(windowConfiguration));
+    config::Cluster cluster = loadCluster(absPath(windowConfiguration).string());
 
     Engine::Callbacks callbacks;
     callbacks.initOpenGL = mainInitFunc;
diff --git a/apps/TaskRunner/main.cpp b/apps/TaskRunner/main.cpp
index 7e038fe34d..1bd16c6394 100644
--- a/apps/TaskRunner/main.cpp
+++ b/apps/TaskRunner/main.cpp
@@ -32,7 +32,6 @@
 #include <ghoul/io/texture/texturereaderdevil.h>
 #include <ghoul/io/texture/texturereaderfreeimage.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/filesystem/directory.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/logging/consolelog.h>
 #include <ghoul/filesystem/file.h>
@@ -117,18 +116,21 @@ int main(int argc, char** argv) {
     // to make it possible to find other files in the same directory.
     FileSys.registerPathToken(
         "${BIN}",
-        ghoul::filesystem::File(absPath(argv[0])).directoryName(),
+        std::filesystem::path(argv[0]).parent_path(),
         ghoul::filesystem::FileSystem::Override::Yes
     );
 
-    std::string configFile = configuration::findConfiguration();
+    std::filesystem::path configFile = configuration::findConfiguration();
 
     // Register the base path as the directory where the configuration file lives
-    std::string base = ghoul::filesystem::File(configFile).directoryName();
+    std::filesystem::path base = configFile.parent_path();
     constexpr const char* BasePathToken = "${BASE}";
     FileSys.registerPathToken(BasePathToken, base);
 
-    *global::configuration = configuration::loadConfigurationFromFile(configFile, "");
+    *global::configuration = configuration::loadConfigurationFromFile(
+        configFile.string(),
+        ""
+    );
     openspace::global::openSpaceEngine->registerPathTokens();
     global::openSpaceEngine->initialize();
 
@@ -160,7 +162,7 @@ int main(int argc, char** argv) {
     // If no task file was specified in as argument, run in CLI mode.
 
     LINFO(fmt::format("Task root: {}", absPath("${TASKS}")));
-    FileSys.setCurrentDirectory(ghoul::filesystem::Directory(absPath("${TASKS}")));
+    std::filesystem::current_path(absPath("${TASKS}"));
 
     std::cout << "TASK > ";
     while (std::cin >> tasksPath) {
diff --git a/config/equirectangular_gui.xml b/config/equirectangular_gui.xml
new file mode 100644
index 0000000000..98c6d545bb
--- /dev/null
+++ b/config/equirectangular_gui.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<Cluster masterAddress="localhost" externalControlPort="20500">
+  <Settings>
+    <Display swapInterval="0" />
+  </Settings>
+  <Node address="localhost" port="20401">
+    <Window fullScreen="false" name="OpenSpace" draw2d="false">
+      <Stereo type="none" />
+      <Size x="1280" y="720" />
+      <Pos x="50" y="50" />
+      <Viewport tracked="true">
+        <Pos x="0.0" y="0.0" />
+        <Size x="1.0" y="1.0" />
+        <EquirectangularProjection quality="1k" />
+      </Viewport>
+    </Window>
+    <Window fullScreen="false" name="GUI" tags="GUI" draw3d="false">
+      <Stereo type="none" />
+      <Size x="1280" y="720" />
+      <Pos x="50" y="50" />
+      <Viewport>
+        <Pos x="0.0" y="0.0" />
+        <Size x="1.0" y="1.0" />
+      </Viewport>
+    </Window>
+  </Node>
+  <User eyeSeparation="0.065">
+    <Pos x="0.0" y="0.0" z="0.0" />
+  </User>
+</Cluster>
diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset
index f5ad4193cd..fe03f650af 100644
--- a/data/assets/customization/globebrowsing.asset
+++ b/data/assets/customization/globebrowsing.asset
@@ -4,6 +4,7 @@ local CreateFocusNodes = false
 local AddMarsLayers = true
 local AddMoonLayers = true
 local AddMercuryLayers = true
+local DataFolder = openspace.absPath('${BASE}/../OpenSpaceData')
 ----------------------------------------
 
 -- If you add layers for different planets than listed here, be sure to add an
@@ -25,11 +26,11 @@ local vrt_folders = {
     -- example:   'C:/OpenSpace/GlobeBrowsingData/Mars/CTX'
 
     -- We recommend using this folder for CTX
-    openspace.absPath('${BASE}/../OpenSpaceData/Mars/CTX'),
+    DataFolder .. '/Mars/CTX',
     -- if not and you have a custom path for CTX layers, enter it below
     '',
     -- We recommend using this folder for HiRISE
-    openspace.absPath('${BASE}/../OpenSpaceData/Mars/HiRISE'),
+    DataFolder .. '/Mars/HiRISE',
     -- if not and you have a custom path for HiRISE layers, enter it below
     ''
   },
@@ -39,8 +40,8 @@ local vrt_folders = {
     -- if areas overlap, images from the lower results will overwrite the images from former
     -- results
     -- example:  'C:/OpenSpace/GlobeBrowsingData/Moon'
-    openspace.absPath('${BASE}/../OpenSpaceData/Moon'),
-    openspace.absPath('${BASE}/../OpenSpaceData/Apollo'),
+    DataFolder .. '/Moon',
+    DataFolder .. '/Apollo',
     ''
   },
   Mercury = {
@@ -49,7 +50,7 @@ local vrt_folders = {
     -- if areas overlap, images from the lower results will overwrite the images from former
     -- results
     -- example:  'C:/OpenSpace/GlobeBrowsingData/Mercury'
-    openspace.absPath('${BASE}/../OpenSpaceData/Mercury'),
+    DataFolder .. '/Mercury',
     ''
   }
 }
diff --git a/data/assets/examples/discs.asset b/data/assets/examples/discs.asset
index 5dcdbc8924..9bb583e96d 100644
--- a/data/assets/examples/discs.asset
+++ b/data/assets/examples/discs.asset
@@ -1,8 +1,8 @@
 local assetHelper = asset.require('util/asset_helper')
 
 -- @TODO (emmbr 2020-02-03) Potential threading issue later on? This will run on the main thread
-local cyanTexture = openspace.createSingeColorImage("example_disc_color1", {0.0, 1.0, 1.0})
-local purpleTexture = openspace.createSingeColorImage("example_disc_color2", {0.5, 0.0, 0.5})
+local cyanTexture = openspace.createSingleColorImage("example_disc_color1", {0.0, 1.0, 1.0})
+local purpleTexture = openspace.createSingleColorImage("example_disc_color2", {0.5, 0.0, 0.5})
 
 local BasicDisc = {
   Identifier = "BasicDisc",
diff --git a/data/assets/examples/grids.asset b/data/assets/examples/grids.asset
index 55468bd399..37ebad89e2 100644
--- a/data/assets/examples/grids.asset
+++ b/data/assets/examples/grids.asset
@@ -17,8 +17,7 @@ local radialGrid = {
     Color = { 0.6, 1.0, 0.7 },
     LineWidth = 3.0,
     GridSegments = { 3, 4 },
-    OuterRadius = 1.0,
-    InnerRadius = 0.2,
+    Radii = { 0.2, 1.0 },
     Enabled = false
   },
   GUI = {
diff --git a/data/assets/examples/primitives.asset b/data/assets/examples/primitives.asset
index d30014306d..23a64b1a0b 100644
--- a/data/assets/examples/primitives.asset
+++ b/data/assets/examples/primitives.asset
@@ -16,7 +16,7 @@ local circle = {
     LineWidth = 3.0,
     GridSegments = { 1, 1 },
     CircleSegments = 64,
-    OuterRadius = 1.0
+    Radii = { 0.0, 1.0 }
   },
   GUI = {
     Name = "Example Circle",
@@ -29,7 +29,7 @@ local ellipse = {
   Transform = {
     Scale = {
       Type = "NonUniformStaticScale",
-      Scale = {1.5, 1.0, 1.0}
+      Scale = { 1.5, 1.0, 1.0 }
     }
   },
   Renderable = {
@@ -38,7 +38,7 @@ local ellipse = {
     LineWidth = 3.0,
     GridSegments = { 1, 1 },
     CircleSegments = 64,
-    OuterRadius = scale
+    Radii = { 0.0, scale }
   },
   GUI = {
     Name = "Example Ellipse",
diff --git a/data/assets/global/openspacebookmarks.asset b/data/assets/global/openspacebookmarks.asset
index 1f6e91e96f..2d3893d1a3 100644
--- a/data/assets/global/openspacebookmarks.asset
+++ b/data/assets/global/openspacebookmarks.asset
@@ -15,7 +15,7 @@ local bookmarksCSV = asset.syncedResource({
 local nodes = {}
 
 asset.onInitialize(function ()
-  nodes = bookmarkHelper.getBookmarks('OpenSpace Bookmarks', bookmarksCSV .. '/bookmarks.csv.txt')
+  nodes = bookmarkHelper.getBookmarks('OpenSpace Bookmarks', bookmarksCSV .. '/bookmarks.csv')
   for _, n in ipairs(nodes) do
     openspace.addSceneGraphNode(n);
   end
diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset
index 23f44a447c..4c881fe192 100644
--- a/data/assets/scene/digitaluniverse/2dF.asset
+++ b/data/assets/scene/digitaluniverse/2dF.asset
@@ -24,13 +24,13 @@ local object = {
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 1.0,
     File = speck .. "/2dF.speck",
+    Unit = "Mpc",
     Texture = textures .. "/point3A.png",
     ColorMap = speck .. "/2dF.cmap",
     ColorOption = { "redshift", "proximity" },
     ColorRange = { { 0.0, 0.075 }, { 1.0, 25.0 } },
-    Unit = "Mpc",
     ScaleFactor = 520.0,
-    BillboardMaxSize = 4.7,
+    BillboardMinMaxSize = { 0.0, 4.7 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset
index f69905f48c..5e5cfa091d 100644
--- a/data/assets/scene/digitaluniverse/2mass.asset
+++ b/data/assets/scene/digitaluniverse/2mass.asset
@@ -24,15 +24,15 @@ local object = {
     Color = { 1.0, 0.4, 0.2 },
     Opacity = 1.0,
     File = speck .. "/2MASS.speck",
+    Unit = "Mpc",
     Texture = textures .. "/point3A.png",
     ColorMap = speck .. "/lss.cmap",
     ColorOption = { "redshift", "prox5Mpc" },
     ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } },
-    Unit = "Mpc",
     CorrectionSizeEndDistance = 20.6,
     CorrectionSizeFactor = 15.0,
     ScaleFactor = 510.78,
-    BillboardMaxSize = 11.15,
+    BillboardMinMaxSize = { 0.0, 11.15 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset
index 8e45fad8b5..90f9ed8634 100644
--- a/data/assets/scene/digitaluniverse/6dF.asset
+++ b/data/assets/scene/digitaluniverse/6dF.asset
@@ -24,14 +24,14 @@ local object = {
     Color = { 1.0, 1.0, 0.0 },
     Opacity = 1.0,
     File = speck .. "/6dF.speck",
+    Unit = "Mpc",
     Texture = textures .. "/point3A.png",
     ColorMap = speck .. "/6dF.cmap",
     ColorOption = { "redshift", "proximity" },
     ColorRange = { { 0.0, 0.075 }, { 1.0, 10.0 } },
-    Unit = "Mpc",
     ScaleFactor = 534.0,
-    BillboardMaxSize = 9.0,
-    EnablePixelSizeControl = true,
+    BillboardMinMaxSize = { 0.0, 9.0 },
+    EnablePixelSizeControl = true
   },
   GUI = {
     Name = "6dF Galaxies",
diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset
index da0a05fd02..38863eba9d 100644
--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -27,10 +27,10 @@ local object = {
     File = speck .. "/abell.speck",
     Texture = textures .. "/point3A.png",
     LabelFile = speck .. "/abell.label",
+    Unit = "Mpc",
     TextColor = { 0.0, 0.8, 0.0 },
     TextSize = 22,
-    TextMinSize = 10.0,
-    Unit = "Mpc",
+    TextMinMaxSize = { 10, 12 },
     TransformationMatrix = {
       -0.7357425748,    0.67726129641,  0.0,           0.0,
       -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
@@ -38,7 +38,7 @@ local object = {
       0.0,              0.0,            0.0,           1.0
     },
     ScaleFactor = 520.0,
-    BillboardMaxSize = 7.0,
+    BillboardMinMaxSize = { 0.0, 7.0 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
index 2a58510736..5e19b98207 100644
--- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset
+++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
@@ -17,11 +17,11 @@ local object = {
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     LabelFile = speck .. "/stars-altlbl.label",
+    Unit = "pc",
     TextColor = { 0.4, 0.4, 0.4 },
     DrawLabels = true,
     TextSize = 14.7,
-    TextMinSize = 6.0,
-    Unit = "pc"
+    TextMinMaxSize = { 6, 20 }
   },
   GUI = {
     Name = "Stars Labels - Alternate",
diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset
index 6b8ef0e794..03c232a957 100644
--- a/data/assets/scene/digitaluniverse/clusters.asset
+++ b/data/assets/scene/digitaluniverse/clusters.asset
@@ -17,11 +17,11 @@ local object = {
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     LabelFile = speck .. "/galclust.label",
+    Unit = "Mpc",
     TextColor = { 1.0, 0.44, 0.0 },
     DrawLabels = true,
     TextSize = 22,
-    TextMinSize = 8.0,
-    Unit = "Mpc",
+    TextMinMaxSize = { 8, 20 },
     TransformationMatrix = {
       -0.7357425748,    0.67726129641,  0.0,           0.0,
       -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset
index e043c1734e..a96db07f75 100644
--- a/data/assets/scene/digitaluniverse/constellations.asset
+++ b/data/assets/scene/digitaluniverse/constellations.asset
@@ -20,8 +20,7 @@ local constellationsExtragalactic = {
     TextColor = { 0.8, 0.8, 0.8 },
     TextOpacity = 0.4,
     TextSize = 20.0,
-    TextMinSize = 20.0,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 20, 30 },
     MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
     Unit = "Mpc"
   },
@@ -42,8 +41,7 @@ local constellations = {
     TextColor = { 0.8, 0.8, 0.8 },
     TextOpacity = 0.3,
     TextSize = 14.5,
-    TextMaxSize = 170.0,
-    TextMinSize = 8.0,
+    TextMinMaxSize = { 8, 170 },
     MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
     Unit = "pc"
   },
diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset
index 7272af3a06..b8d91282b0 100644
--- a/data/assets/scene/digitaluniverse/deepsky.asset
+++ b/data/assets/scene/digitaluniverse/deepsky.asset
@@ -30,15 +30,12 @@ local deepSkyPoints = {
     --ColorOption = { "prox5Mpc" },
     --ColorRange = { { 1.0, 30.0 } },
     LabelFile = speck .. "/dso.label",
+    Unit = "pc",
     TextColor = { 0.1, 0.4, 0.6 },
     TextSize = 20.50,
-    TextMinSize = 16.0,
-    Unit = "pc",
-    -- Fade in value in the same unit as "Unit"
-    --FadeInDistances = { 0.05, 1.0 },
-    -- Max size in pixels
-    BillboardMaxSize = 8.22,
-    BillboardMinSize = 0.0,
+    TextMinMaxSize = { 16, 20 },
+    --FadeInDistances = { 0.05, 1.0 }, -- Fade in value in the same unit as "Unit"
+    BillboardMinMaxSize = { 0.0, 8.22 }, -- in pixels
     --CorrectionSizeEndDistance = 22.0,
     --CorrectionSizeFactor = 10.45
     EnablePixelSizeControl = true
diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset
index 7919dc2038..c4922feb04 100644
--- a/data/assets/scene/digitaluniverse/dwarfs.asset
+++ b/data/assets/scene/digitaluniverse/dwarfs.asset
@@ -26,18 +26,18 @@ local object = {
     File = speck .. "/dwarfs.speck",
     Texture = textures .. "/point3.png",
     LabelFile = speck .. "/dwarfs.label",
+    Unit = "pc",
     ColorMap = speck .. "/dwarfs.cmap",
     ColorOption = { "typeindex" },
     --ColorRange = { { 1.0, 4.0} },
     TextColor = { 0.5, 0.1, 0.2 },
     TextSize = 14.6,
-    TextMinSize = 10.0,
+    TextMinMaxSize = { 10, 20 },
     ScaleFactor = 372.1,
     --CorrectionSizeEndDistance = 16.1,
     --CorrectionSizeFactor = 7.75,
-    BillboardMaxSize = 20.0,
-    EnablePixelSizeControl = true,
-    Unit = "pc"
+    BillboardMinMaxSize = { 0.0, 20.0 },
+    EnablePixelSizeControl = true
   },
   GUI = {
     Name = "Brown Dwarfs",
diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset
index 4fb990c4e4..27ccda1a29 100644
--- a/data/assets/scene/digitaluniverse/exoplanets.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets.asset
@@ -27,15 +27,14 @@ local object = {
     Texture = textures .. "/target-blue.png",
     File = speck .. "/expl.speck",
     LabelFile = speck .. "/expl.label",
+    Unit = "pc",
     ScaleFactor = 388.67923,
     TextColor = { 0.3, 0.3, 0.8 },
     TextSize = 14.8,
-    TextMaxSize = 200.0,
-    TextMinSize = 10.0,
+    TextMinMaxSize = { 10, 100 },
     CorrectionSizeEndDistance = 15.23,
     CorrectionSizeFactor = 13.3,
-    Unit = "pc",
-    BillboardMaxSize = 75.0,
+    BillboardMinMaxSize = { 0.0, 75.0 },
     EnablePixelSizeControl = true,
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset
index 179fe2cbc9..77e85d35c5 100644
--- a/data/assets/scene/digitaluniverse/globularclusters.asset
+++ b/data/assets/scene/digitaluniverse/globularclusters.asset
@@ -27,13 +27,12 @@ local object = {
     Texture = textures .. "/point4.png",
     PolygonSides = 5,
     LabelFile = speck .. "/gc.label",
+    Unit = "pc",
     TextColor = { 0.5, 0.5, 0.0 },
     ScaleFactor = 431.0,
     TextSize = 16.7,
-    TextMinSize = 4.0,
-    TextMaxSize = 20,
-    Unit = "pc",
-    BillboardMaxSize = 500,
+    TextMinMaxSize = { 4, 20 },
+    BillboardMinMaxSize = { 0.0, 500.0 },
     EnablePixelSizeControl = true,
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset
index 56caaca447..9ba8ad9a53 100644
--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -110,12 +110,11 @@ local eclipticLabels = {
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     LabelFile = speck .. "/eclip.label",
+    Unit = "pc",
     DrawLabels = true,
     TextColor = { 0.5, 0.5, 0.5 },
     TextSize = 14.75,
-    TextMinSize = 1.3,
-    TextMaxSize = 50.0,
-    Unit = "pc",
+    TextMinMaxSize = { 1, 50 },
     TransformationMatrix = {
       -0.05487554,  0.4941095, -0.8676661,    0.0,
       -0.9938214 , -0.1109906, -0.0003515167, 0.0,
@@ -164,12 +163,11 @@ local equatorialLabels = {
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     LabelFile = speck .. "/radec.label",
+    Unit = "pc",
     DrawLabels = true,
     TextColor = { 0.5, 0.5, 0.5 },
     TextSize = 14.5,
-    TextMinSize = 1.7,
-    TextMaxSize = 70.0,
-    Unit = "pc",
+    TextMinMaxSize = { 2, 70 },
     TransformationMatrix = {
       -0.05487554,  0.4941095, -0.8676661, 0.0,
       -0.8734371 , -0.4448296, -0.1980764, 0.0,
@@ -214,12 +212,11 @@ local galacticLabels = {
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     LabelFile = speck .. "/galac.label",
+    Unit = "pc",
     DrawLabels = true,
     TextColor = { 0.5, 0.5, 0.5 },
     TextSize = 15.8,
-    TextMinSize = 0.5,
-    TextMaxSize = 100.0,
-    Unit = "pc"
+    TextMinMaxSize = { 1, 100 }
   },
   GUI = {
     Name = "Galactic Sphere Labels",
@@ -245,8 +242,7 @@ local plane1ld = {
     LabelFile = speck .. "/1ld.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 10.3,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "Km"
   },
   GUI = {
@@ -273,8 +269,7 @@ local plane1lm = {
     LabelFile = speck .. "/1lm.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 11.8,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -301,8 +296,7 @@ local plane1ly = {
     LabelFile = speck .. "/1ly.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 13.0,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -329,8 +323,7 @@ local plane10ly = {
     LabelFile = speck .. "/10ly.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 14.17,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -357,8 +350,7 @@ local plane100ly = {
     LabelFile = speck .. "/100ly.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 15.0,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -385,8 +377,7 @@ local plane1kly = {
     LabelFile = speck .. "/1kly.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 16.0,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -413,8 +404,7 @@ local plane10kly = {
     LabelFile = speck .. "/10kly.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 17.25,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -434,8 +424,7 @@ local plane100kly = {
     LabelFile = speck .. "/100kly.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 18.6,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "Mpc"
   },
   GUI = {
@@ -455,8 +444,7 @@ local plane1Mly = {
     LabelFile = speck .. "/1Mly.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 19.6,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "Mpc"
   },
   GUI = {
@@ -476,8 +464,7 @@ local plane10Mly = {
     LabelFile = speck .. "/10Mly.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 20.6,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "Mpc"
   },
   GUI = {
@@ -497,8 +484,7 @@ local plane100Mly = {
     LabelFile = speck .. "/100Mly.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 21.6,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "Mpc"
   },
   GUI = {
@@ -518,8 +504,7 @@ local plane20Gly = {
     LabelFile = speck .. "/20Gly.label",
     TextColor = { 0.0, 0.2, 0.5 },
     TextSize = 23.6,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    TextMinMaxSize = { 0, 30 },
     Unit = "Mpc"
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset
index 3653225819..ed426cbdd2 100644
--- a/data/assets/scene/digitaluniverse/groups.asset
+++ b/data/assets/scene/digitaluniverse/groups.asset
@@ -18,10 +18,10 @@ local object = {
     Opacity = 0.65,
     --ScaleFactor = 10.0,
     LabelFile = speck .. "/groups.label",
+    Unit = "Mpc",
     TextColor = { 0.1, 0.6, 0.2 },
     TextSize = 21.5,
-    TextMinSize = 8.0,
-    Unit = "Mpc",
+    TextMinMaxSize = { 8, 20 },
     DrawLabels = true,
     TransformationMatrix = {
       -0.7357425748,    0.67726129641,  0.0,           0.0,
diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset
index 946c1fb9ca..9648f7d088 100644
--- a/data/assets/scene/digitaluniverse/h2regions.asset
+++ b/data/assets/scene/digitaluniverse/h2regions.asset
@@ -27,13 +27,12 @@ local object = {
     Texture = textures .."/point4.png",
     PolygonSides = 6,
     LabelFile = speck .. "/h2.label",
+    Unit = "pc",
     TextColor = { 0.5, 0.5, 0.5 },
     ScaleFactor = 420,
     TextSize = 16.24,
-    TextMinSize = 4.0,
-    TextMaxSize = 20.0,
-    Unit = "pc",
-    BillboardMaxSize = 300.0,
+    TextMinMaxSize = { 4, 20 },
+    BillboardMinMaxSize = { 0.0, 300.0 },
     EnablePixelSizeControl = false
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/hdf.asset b/data/assets/scene/digitaluniverse/hdf.asset
new file mode 100644
index 0000000000..51e30e3dfd
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/hdf.asset
@@ -0,0 +1,84 @@
+local assetHelper = asset.require('util/asset_helper')
+local circle = asset.require('util/circle').circle
+
+local HUDFSpeck = asset.syncedResource({
+  Name = "HUDF Speck",
+  Type = "HttpSynchronization",
+  Identifier = "digitaluniverse_hudf_speck",
+  Version = 1
+})
+
+local ColorMap = asset.syncedResource({
+  Name = "HUDF color map",
+  Type = "HttpSynchronization",
+  Identifier = "digitaluniverse_hudf_textures",
+  Version = 1
+})
+
+local object = {
+  Identifier = "HubbleDeepField",
+  Renderable = {
+    Type = "RenderableBillboardsCloud",
+    Enabled = false,
+    Color = { 1.0, 1.0, 1.0 },
+    Opacity = 1.0,
+    File = HUDFSpeck .. "/hudf.speck",
+    Texture = circle .. "/circle.png",
+    ColorMap = ColorMap .. "/hudf.cmap",
+    ColorOption = { "redshift", "proximity" },
+    ColorRange = { { 0.0, 0.075 }, { 1.0, 25.0 } },
+    Unit = "Mpc",
+    ScaleFactor = 520.0,
+    BillboardMaxSize = 4.7,
+    EnablePixelSizeControl = true
+  },
+  GUI = {
+    Name = "Hubble Deep Field",
+    Path = "/Universe/Galaxies",
+    Description = [[
+      Hubble Ultra Deep Field galaxy survey <br><br>
+      Data Reference: Hubble Ultra Deep Field 2012 program (Ellis+, Koekemoer+, 2013)
+    ]],
+  }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { object })
+
+asset.meta = {
+  Name = "Hubble Ultra Deep Field",
+  Version = "1.1",
+  Description = "Hubble Ultra Deep Field galaxy survey",
+  Author = "Frank Summers (STScI), Brian Abbott (AMNH)",
+  Identifiers = {"HubbleDeepField"},
+  URL = "http://www.haydenplanetarium.org/universe",
+  License = [[
+    Copyright (c) American Museum of Natural History. All rights reserved.<br><br>
+
+    Downloading the Atlas:<br>
+    AMNH offers the Atlas free of charge via our website, http://www.haydenplanetarium.org/.
+    The User is free to download and/or duplicate verbatim copies of the Atlas provided this
+    license and copyright information accompany the Atlas.<br><br>
+
+    Modifying the Atlas:<br>
+    The user is free to modify the Atlas by either adding data or altering existing data,
+    provided it is for personal use only. Once the user modifies the Atlas, it is no longer
+    part of AMNH's Atlas and cannot be used publicly alongside or within the Atlas without
+    written permission from AMNH.<br><br>
+
+    Distributing the Atlas:<br>
+    The user is forbidden to distribute and use the Atlas for profit, as part of a software
+    and/or production system that will subsequently be redistributed, or for public consumption
+    (via print, electronic media, or broadcast/produced pieces) without written permission
+    from AMNH.<br><br>
+
+    Neither the names of American Museum of Natural History and Hayden Planetarium nor the names
+    of their contributors may be used to endorse or promote products derived from this Atlas
+    without specific, prior written permission.<br><br>
+
+    The Atlas is free but is offered WITHOUT ANY WARRANTY of any kind. We provide the Atlas as
+    is and take no responsibility for any damage resulting from the use of this Atlas. The entire
+    risk as to the quality and performance of this product is with the user.<br><br>
+
+    For more information, please visit http://www.haydenplanetarium.org/universe
+  ]]
+}
diff --git a/data/assets/scene/digitaluniverse/kepler.asset b/data/assets/scene/digitaluniverse/kepler.asset
index 38ce9309a9..d07868db17 100644
--- a/data/assets/scene/digitaluniverse/kepler.asset
+++ b/data/assets/scene/digitaluniverse/kepler.asset
@@ -25,11 +25,11 @@ local object = {
     Opacity = 0.99,
     ScaleFactor = 410.0,
     File = speck .. "/kepler.speck",
+    Unit = "pc",
     Texture = textures .. "/halo.png",
     CorrectionSizeEndDistance = 15.86,
     CorrectionSizeFactor = 8.59,
-    Unit = "pc",
-    BillboardMaxSize = 30.0,
+    BillboardMinMaxSize = { 0.0, 30.0 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset
index 8bd7fddce6..ac23ad0dc6 100644
--- a/data/assets/scene/digitaluniverse/localdwarfs.asset
+++ b/data/assets/scene/digitaluniverse/localdwarfs.asset
@@ -29,12 +29,12 @@ local object = {
     Texture = textures .. "/point4.png",
     PolygonSides = 12,
     LabelFile = speck .. "/localgroup.label",
+    Unit = "Mpc",
     TextColor = { 0.3, 0.3, 1.0 },
     ScaleFactor = 465,
     TextSize = 18.3,
-    TextMinSize = 7.3,
-    Unit = "Mpc",
-    BillboardMaxSize = 20.0,
+    TextMinMaxSize = { 7, 20 },
+    BillboardMinMaxSize = { 0.0, 20.0 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/milkyway_label.asset b/data/assets/scene/digitaluniverse/milkyway_label.asset
index 20fb25276e..60908e0a35 100644
--- a/data/assets/scene/digitaluniverse/milkyway_label.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_label.asset
@@ -20,19 +20,18 @@ local homeLabel = {
     ScaleFactor = 500.0,
     DrawLabels = true,
     LabelFile = homespeck .. "/home.label",
+    Unit = "Mpc",
     TextColor = { 0.8, 0.8, 0.8 },
     TextSize = 20.50,
-    TextMinSize = 16.0,
+    TextMinMaxSize = { 16, 20 },
     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
     },
-    Unit = "Mpc",
     FadeInDistances = { 0.05, 1.0 },
-    BillboardMaxSize = 8.22,
-    BillboardMinSize = 0.0,
+    BillboardMinMaxSize = { 0.0, 8.22 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset
index 3814638db9..1339706042 100644
--- a/data/assets/scene/digitaluniverse/obassociations.asset
+++ b/data/assets/scene/digitaluniverse/obassociations.asset
@@ -24,20 +24,19 @@ local object = {
     Color = { 1.0, 1.0, 1.0 },
     ColorMap = speck .. "/ob.cmap",
     ColorOption = { "arm" },
-    SizeOption = {"diameter"},
+    SizeOption = { "diameter" },
     ExactColorMap = true,
     Opacity = 0.7,
     File = speck .. "/ob.speck",
+    Unit = "pc",
     Texture = textures .. "/point4.png",
     PolygonSides = 7,
     LabelFile = speck .. "/ob.label",
     TextColor = { 0.4, 0.5, 1.0 },
     ScaleFactor = 390.0,
     TextSize = 16.24,
-    TextMinSize = 4.50,
-    TextMaxSize = 25,
-    Unit = "pc",
-    BillboardMaxSize = 450.0,
+    TextMinMaxSize = { 4, 25 },
+    BillboardMinMaxSize = { 0.0, 450.0 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset
index 86bbc5b5c9..bb4ae711e5 100644
--- a/data/assets/scene/digitaluniverse/openclusters.asset
+++ b/data/assets/scene/digitaluniverse/openclusters.asset
@@ -24,16 +24,15 @@ local object = {
     Color = { 0.1, 0.8, 0.4 },
     Opacity = 0.5,
     File = speck .. "/oc.speck",
+    Unit = "pc",
     Texture = textures .. "/point4.png",
     PolygonSides = 12,
     TextColor = { 0.05, 0.4, 0.2 },
     LabelFile = speck .. "/oc.label",
     ScaleFactor = 405.75,
     TextSize = 15.5,
-    TextMinSize = 4.5,
-    TextMaxSize = 30.0,
-    Unit = "pc",
-    BillboardMaxSize = 604,
+    TextMinMaxSize = { 4, 30 },
+    BillboardMinMaxSize = { 0.0, 604.0 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset
index 7fb7d217ad..c2a0c107d2 100644
--- a/data/assets/scene/digitaluniverse/planetarynebulae.asset
+++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset
@@ -27,13 +27,12 @@ local object = {
     Texture = textures .. "/point4.png",
     PolygonSides = 3,
     LabelFile = speck .. "/pn.label",
+    Unit = "pc",
     TextColor = { 0.25, 0.25, 0.65 },
     ScaleFactor = 425.0,
     TextSize = 16.24,
-    TextMinSize = 4.5,
-    TextMaxSize = 25.0,
-    Unit = "pc",
-    BillboardMaxSize = 500,
+    TextMinMaxSize = { 4, 25 },
+    BillboardMinMaxSize = { 0.0, 500.0 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset
index 8defe08274..6e122a3336 100644
--- a/data/assets/scene/digitaluniverse/pulsars.asset
+++ b/data/assets/scene/digitaluniverse/pulsars.asset
@@ -27,13 +27,12 @@ local object = {
     Texture = textures .. "/point4.png",
     PolygonSides = 4,
     LabelFile = speck .. "/pulsar.label",
+    Unit = "pc",
     TextColor = { 0.7, 0.2, 0.2 },
     ScaleFactor = 424,
     TextSize = 15.77,
-    TextMinSize = 4,
-    TextMaxSize = 20.0,
-    Unit = "pc",
-    BillboardMaxSize = 500,
+    TextMinMaxSize = { 4, 20 },
+    BillboardMinMaxSize = { 0.0, 500.0 },
     EnablePixelSizeControl = false
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset
index 69336ed468..3ec14ef05b 100644
--- a/data/assets/scene/digitaluniverse/quasars.asset
+++ b/data/assets/scene/digitaluniverse/quasars.asset
@@ -27,11 +27,8 @@ local object = {
     Texture = textures .. "/point3A.png",
     Unit = "Mpc",
     ScaleFactor = 540.9,
-    -- Fade in value in the same unit as "Unit"
-    FadeInDistances = { 1000.0, 10000.0 },
-    BillboardMaxSize = 30.0,
-    BillboardMinSize = 0.0,
-    BillboardMaxSize = 11.1,
+    FadeInDistances = { 1000.0, 10000.0 }, -- Fade in value in the same unit as "Unit"
+    BillboardMinMaxSize = { 0.0, 11.1 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset
index 61914b1951..de7391eba0 100644
--- a/data/assets/scene/digitaluniverse/sdss.asset
+++ b/data/assets/scene/digitaluniverse/sdss.asset
@@ -30,16 +30,12 @@ local object = {
     ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } },
     Texture = textures .. "/point3A.png",
     Unit = "Mpc",
-    -- Fade in value in the same unit as "Unit"
-    FadeInDistances = { 220.0, 650.0 },
-    BillboardMaxSize = 50.0,
-    BillboardMinSize = 0.0,
+    FadeInDistances = { 220.0, 650.0 }, -- Fade in value in the same unit as "Unit"
+    BillboardMinMaxSize = { 0.0, 5.5 },
     CorrectionSizeEndDistance = 20.65,
     CorrectionSizeFactor = 10.41,
     TextSize = 14.8,
-    TextMinSize = 10.0,
-    TextMaxSize = 50.0,
-    BillboardMaxSize = 5.5,
+    TextMinMaxSize = { 10, 50 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset
index 8a8c99105f..387975abbd 100644
--- a/data/assets/scene/digitaluniverse/starlabels.asset
+++ b/data/assets/scene/digitaluniverse/starlabels.asset
@@ -17,12 +17,11 @@ local object = {
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     LabelFile = speck .. "/stars.label",
+    Unit = "pc",
     TextColor = { 0.4, 0.4, 0.4 },
     DrawLabels = true,
     TextSize = 14.7,
-    TextMinSize = 6.0,
-    TextMaxSize = 50.0,
-    Unit = "pc"
+    TextMinMaxSize = { 6, 50 }
   },
   GUI = {
     Name = "Stars Labels",
diff --git a/data/assets/scene/digitaluniverse/starorbits.asset b/data/assets/scene/digitaluniverse/starorbits.asset
index 4287107301..d79d96d2fa 100644
--- a/data/assets/scene/digitaluniverse/starorbits.asset
+++ b/data/assets/scene/digitaluniverse/starorbits.asset
@@ -20,10 +20,8 @@ local sunOrbit = {
     File = speck .. "/starorbits-Sun.speck",
     MeshColor = {{ 1.0, 0.65, 0.0 }},
     --LabelFile = speck .. "/1ld.label",
-    TextColor = { 0.0, 0.2, 0.5 },
-    TextSize = 10.3,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    -- TextColor = { 0.0, 0.2, 0.5 },
+    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -43,10 +41,9 @@ local barnardsOrbit = {
     File = speck .. "/starorbits-BarnardsStar.speck",
     MeshColor = {{0.39, 0.58, 0.93}},
     --LabelFile = speck .. "/1ld.label",
-    TextColor = { 0.0, 0.2, 0.5 },
-    TextSize = 10.3,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    -- TextColor = { 0.0, 0.2, 0.5 },
+    -- TextSize = 10.3,
+    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -66,10 +63,9 @@ local kapteynsOrbit = {
     File = speck .. "/starorbits-KapteynsStar.speck",
     MeshColor = {{0.6, 0.6, 0.6}},
     --LabelFile = speck .. "/1ld.label",
-    TextColor = { 0.0, 0.2, 0.5 },
-    TextSize = 10.3,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    -- TextColor = { 0.0, 0.2, 0.5 },
+    -- TextSize = 10.3,
+    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -89,10 +85,9 @@ local lacaille9352Orbit = {
     File = speck .. "/starorbits-Lacaille9352.speck",
     MeshColor = {{0.58, 0.0, 0.83}},
     --LabelFile = speck .. "/1ld.label",
-    TextColor = { 0.0, 0.2, 0.5 },
-    TextSize = 10.3,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    -- TextColor = { 0.0, 0.2, 0.5 },
+    -- TextSize = 10.3,
+    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -112,10 +107,9 @@ local lSR1826Orbit = {
     File = speck .. "/starorbits-LSR1826+3014.speck",
     MeshColor = {{0.0, 0.39, 0.0}},
     --LabelFile = speck .. "/1ld.label",
-    TextColor = { 0.0, 0.2, 0.5 },
-    TextSize = 10.3,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    -- TextColor = { 0.0, 0.2, 0.5 },
+    -- TextSize = 10.3,
+    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -135,10 +129,9 @@ local lSRJ0822Orbit = {
     File = speck .. "/starorbits-LSRJ0822+1700.speck",
     MeshColor = {{0.5, 1.0, 0.0}},
     --LabelFile = speck .. "/1ld.label",
-    TextColor = { 0.0, 0.2, 0.5 },
-    TextSize = 10.3,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    -- TextColor = { 0.0, 0.2, 0.5 },
+    -- TextSize = 10.3,
+    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
@@ -158,10 +151,9 @@ local pM_J13420Orbit = {
     File = speck .. "/starorbits-PM_J13420-3415.speck",
     MeshColor = {{0.70, 0.13, 0.13}},
     --LabelFile = speck .. "/1ld.label",
-    TextColor = { 0.0, 0.2, 0.5 },
-    TextSize = 10.3,
-    TextMinSize = 0.5,
-    TextMaxSize = 30.0,
+    -- TextColor = { 0.0, 0.2, 0.5 },
+    -- TextSize = 10.3,
+    -- TextMinMaxSize = { 0, 30 },
     Unit = "pc"
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset
index 3103cd6c9a..db0ac4adb7 100644
--- a/data/assets/scene/digitaluniverse/stars.asset
+++ b/data/assets/scene/digitaluniverse/stars.asset
@@ -1,13 +1,7 @@
 local assetHelper = asset.require('util/asset_helper')
 
-local colorLUT = asset.require('./stars_colormap').BvColorLUT
-
-local textures = asset.syncedResource({
-  Name = "Stars Textures",
-  Type = "HttpSynchronization",
-  Identifier = "stars_textures",
-  Version = 1
-})
+local colormaps = asset.require('./stars_colormap').ColorMaps
+local textures = asset.require('./stars_textures').textures
 
 local speck = asset.syncedResource({
   Name = "Stars Speck Files",
@@ -30,10 +24,21 @@ local stars = {
     File = speck .. "/stars.speck",
     Texture = textures .. "/halo.png",
     --ShapeTexture = textures .. "/disc.png",
-    ColorMap = colorLUT .. "/colorbv.cmap",
+    ColorMap = colormaps .. "/colorbv.cmap",
+    OtherDataColorMap = colormaps .. "/viridis.cmap",
     MagnitudeExponent = 6.2,
     SizeComposition = "Distance Modulus",
-    RenderMethod = "Texture Based" -- or PSF
+    RenderMethod = "Texture Based", -- or PSF
+    DataMapping = {
+      Bv = "colorb_v",
+      Luminance = "lum",
+      AbsoluteMagnitude = "absmag",
+      ApparentMagnitude = "appmag",
+      Vx = "vx",
+      Vy = "vy",
+      Vz = "vz",
+      Speed = "speed"
+    }
   },
   GUI = {
     Name = "Stars",
@@ -55,12 +60,22 @@ local sunstar = {
     File = sunspeck .. "/sunstar.speck",
     Texture = textures .. "/halo.png",
     --ShapeTexture = textures .. "/disc.png",
-    ColorMap = colorLUT .. "/colorbv.cmap",
+    ColorMap = colormaps .. "/colorbv.cmap",
     MagnitudeExponent = 6.2,
     SizeComposition = "Distance Modulus",
     RenderMethod = "Texture Based", -- or PSF
     FadeInDistances = { 0.0001, 0.1 },
-    RenderableType = "PostDeferredTransparent"
+    RenderableType = "PostDeferredTransparent",
+    DataMapping = {
+      Bv = "colorb_v",
+      Luminance = "lum",
+      AbsoluteMagnitude = "absmag",
+      ApparentMagnitude = "appmag",
+      Vx = "vx",
+      Vy = "vy",
+      Vz = "vz",
+      Speed = "speed",
+    }
   },
   GUI = {
     Name = "Sun",
diff --git a/data/assets/scene/digitaluniverse/stars_colormap.asset b/data/assets/scene/digitaluniverse/stars_colormap.asset
index eb4cbc22e3..d8aaa83f1d 100644
--- a/data/assets/scene/digitaluniverse/stars_colormap.asset
+++ b/data/assets/scene/digitaluniverse/stars_colormap.asset
@@ -1,20 +1,20 @@
 local assetHelper = asset.require('util/asset_helper')
 
-local BvColorLUT = asset.syncedResource({
+local colormaps = asset.syncedResource({
   Name = "Stars Color Table",
   Type = "HttpSynchronization",
   Identifier = "stars_colormap",
   Version = 2
 })
 
-asset.export("BvColorLUT", BvColorLUT)
+asset.export("ColorMaps", colormaps)
 
 asset.meta = {
-  Name = "Stars B-V Colormap",
+  Name = "Star Colormaps",
   Version = "2.0",
-  Description = [[A lookup table that maps a B-V color index to an RGB color. 
-    The B-V values are in the range (-0.4, 2.0) and each line maps a value 
-    in that range to a color]],
+  Description = [[Lookup tables used for star datasets, one of the tables map a B-V color
+    index to an RGB color. The B-V values are in the range (-0.4, 2.0) and each line maps
+    a value in that range to a color. The other table is the commonly used viridis map]],
   Author = "OpenSpace Team",
   URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
   License = "AMNH Digital Universe"
diff --git a/data/assets/scene/digitaluniverse/stars_textures.asset b/data/assets/scene/digitaluniverse/stars_textures.asset
new file mode 100644
index 0000000000..d57f6d0907
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/stars_textures.asset
@@ -0,0 +1,20 @@
+local assetHelper = asset.require('util/asset_helper')
+
+local textures = asset.syncedResource({
+  Name = "Stars Textures",
+  Type = "HttpSynchronization",
+  Identifier = "stars_textures",
+  Version = 1
+})
+
+asset.export("textures", textures)
+
+asset.meta = {
+  Name = "Star Textures",
+  Version = "1.0",
+  Description = [[Square textures used to represent stars when applied to camera-facing bil;board]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT License"
+}
+
diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset
index 85546e608e..facc29d313 100644
--- a/data/assets/scene/digitaluniverse/superclusters.asset
+++ b/data/assets/scene/digitaluniverse/superclusters.asset
@@ -27,13 +27,13 @@ local object = {
     File = speck .. "/superclust.speck",
     Texture = textures .. "/point3A.png",
     LabelFile = speck .. "/superclust.label",
+    Unit = "Mpc",
     TextColor = { 0.9, 0.9, 0.9 },
     ScaleFactor = 531.0,
     TextSize = 22.44,
-    TextMinSize = 8.0,
-    Unit = "Mpc",
+    TextMinMaxSize = { 8, 20 },
     DrawLabels = true,
-    --BillboardMaxSize = 7.2,
+    --BillboardMinMaxSize = { 0.0, 7.2 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset
index 20a4f8f557..efa2c2844f 100644
--- a/data/assets/scene/digitaluniverse/supernovaremnants.asset
+++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset
@@ -27,15 +27,14 @@ local object = {
     Texture = textures .. "/point4.png",
     PolygonSides = 7,
     LabelFile = speck .. "/snr.label",
+    Unit = "pc",
     TextColor = { 0.6, 0.46, 0.0 },
     ScaleFactor = 424,
     TextSize = 16.44,
-    TextMinSize = 4.0,
-    TextMaxSize = 200.0,
+    TextMinMaxSize = { 4, 100 },
     --CorrectionSizeEndDistance = 17.5,
     --CorrectionSizeFactor = 13.96,
-    Unit = "pc",
-    BillboardMaxSize = 500,
+    BillboardMinMaxSize = { 0.0, 500.0 },
     EnablePixelSizeControl = true
   },
   GUI = {
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index 21e65f5ed5..d06deb8a4c 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -33,21 +33,18 @@ local tullyPoints = {
     ColorRange = { { 1.0, 30.0 } },
     LabelFile = speck .. "/tully.label",
     DrawLabels = false,
+    Unit = "Mpc",
     TextColor = { 0.7, 0.7, 0.7 },
     TextSize = 19.36,
-    TextMinSize = 8.2,
+    TextMinMaxSize = { 8, 20 },
     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
     },
-    Unit = "Mpc",
-    -- Fade in value in the same unit as "Unit"
-    FadeInDistances = { 0.001, 1.0 },
-    -- Max size in pixels
-    BillboardMaxSize = 7,
-    BillboardMinSize = 0,
+    FadeInDistances = { 0.001, 1.0 }, -- Fade in value in the same unit as "Unit"
+    BillboardMinMaxSize = { 0.0, 7.0 }, -- in pixels
     --CorrectionSizeEndDistance = 22.0,
     --CorrectionSizeFactor = 10.45
     EnablePixelSizeControl = true
diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset
index 20538ee161..269ae7c7e7 100644
--- a/data/assets/scene/digitaluniverse/voids.asset
+++ b/data/assets/scene/digitaluniverse/voids.asset
@@ -19,10 +19,10 @@ local object = {
     Color = { 1.0, 1.0, 1.0 },
     Opacity = 0.65,
     LabelFile = speck .. "/voids.label",
+    Unit = "Mpc",
     TextColor = { 0.296, 0.629, 1.0 },
     TextSize = 20.9,
-    TextMinSize = 8.0,
-    Unit = "Mpc"
+    TextMinMaxSize = { 8, 20 }
   },
   GUI = {
     Name = "Voids",
diff --git a/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset b/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset
index 73d4f033a5..45597c4302 100644
--- a/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset
+++ b/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset
@@ -1,4 +1,4 @@
-local bvColorLUT = asset.require('scene/digitaluniverse/stars_colormap').BvColorLUT
+local colormaps = asset.require('scene/digitaluniverse/stars_colormap').ColorMaps
 
 local DataPath = asset.syncedResource({
   Name = "Exoplanet Data Files",
@@ -15,7 +15,7 @@ asset.onInitialize(function ()
 
   p = "Modules.Exoplanets.BvColormap";
   if (openspace.getPropertyValue(p) == "") then
-    openspace.setPropertyValueSingle(p, bvColorLUT .. "/colorbv.cmap")
+    openspace.setPropertyValueSingle(p, colormaps .. "/colorbv.cmap")
   end
 end)
 
diff --git a/data/assets/scene/milkyway/gaia/apogee.asset b/data/assets/scene/milkyway/gaia/apogee.asset
index efa58038ff..b6abe3159a 100644
--- a/data/assets/scene/milkyway/gaia/apogee.asset
+++ b/data/assets/scene/milkyway/gaia/apogee.asset
@@ -1,14 +1,9 @@
 local assetHelper = asset.require('util/asset_helper')
 
+local colorLUT = asset.require('scene/digitaluniverse/stars_colormap').ColorMaps
+local textures = asset.require('scene/digitaluniverse/stars_textures').textures
 
 
-local textures = asset.syncedResource({
-  Name = "Stars Textures",
-  Type = "HttpSynchronization",
-  Identifier = "stars_textures",
-  Version = 1
-})
-
 local speck = asset.syncedResource({
   Name = "Apogee Speck Files",
   Type = "HttpSynchronization",
@@ -16,13 +11,6 @@ local speck = asset.syncedResource({
   Version = 1
 })
 
-local colorLUT = asset.syncedResource({
-  Name = "Stars Color Table",
-  Type = "HttpSynchronization",
-  Identifier = "stars_colormap",
-  Version = 2
-})
-
 local gaia_abundance_apogee = {
   Identifier = "Gaia Abundance Apogee",
   Renderable = {
@@ -39,7 +27,17 @@ local gaia_abundance_apogee = {
     ColorMap = colorLUT .. "/colorbv.cmap",
     OtherDataColorMap = colorLUT .. "/viridis.cmap",
     StaticFilter = -9999,
-    StaticFilterReplacement = 0.0
+    StaticFilterReplacement = 0.0,
+    DataMapping = {
+      Bv = "colorb_v",
+      Luminance = "lum",
+      AbsoluteMagnitude = "absmag",
+      ApparentMagnitude = "appmag",
+      Vx = "vx",
+      Vy = "vy",
+      Vz = "vz",
+      Speed = "speed"
+    }
   },
   GUI = {
     Path = "/Milky Way/Gaia"
diff --git a/data/assets/scene/milkyway/gaia/gaiastars.asset b/data/assets/scene/milkyway/gaia/gaiastars.asset
index 997eaa55e5..5eeeb15162 100644
--- a/data/assets/scene/milkyway/gaia/gaiastars.asset
+++ b/data/assets/scene/milkyway/gaia/gaiastars.asset
@@ -1,18 +1,7 @@
 local assetHelper = asset.require("util/asset_helper")
 
-local textures = asset.syncedResource({
-  Name = "Stars Textures",
-  Type = "HttpSynchronization",
-  Identifier = "stars_textures",
-  Version = 1
-})
-
-local colorLUT = asset.syncedResource({
-  Name = "Stars Color Table",
-  Type = "HttpSynchronization",
-  Identifier = "stars_colormap",
-  Version = 1
-})
+local colorLUT = asset.require('scene/digitaluniverse/stars_colormap').ColorMaps
+local textures = asset.require('scene/digitaluniverse/stars_textures').textures
 
 -- Download a preprocessed binary octree of Radial Velocity subset values per star (preprocessed into 8 binary files).
 local starsFolder = asset.syncedResource({
diff --git a/data/assets/scene/milkyway/gaia/galah.asset b/data/assets/scene/milkyway/gaia/galah.asset
index c9163b2ff3..f4c814c20a 100644
--- a/data/assets/scene/milkyway/gaia/galah.asset
+++ b/data/assets/scene/milkyway/gaia/galah.asset
@@ -1,13 +1,7 @@
 local assetHelper = asset.require('util/asset_helper')
 
-
-
-local textures = asset.syncedResource({
-  Name = "Stars Textures",
-  Type = "HttpSynchronization",
-  Identifier = "stars_textures",
-  Version = 1
-})
+local colorLUT = asset.require('scene/digitaluniverse/stars_colormap').ColorMaps
+local textures = asset.require('scene/digitaluniverse/stars_textures').textures
 
 local speck = asset.syncedResource({
   Name = "Galah Speck Files",
@@ -16,12 +10,6 @@ local speck = asset.syncedResource({
   Version = 1
 })
 
-local colorLUT = asset.syncedResource({
-  Name = "Stars Color Table",
-  Type = "HttpSynchronization",
-  Identifier = "stars_colormap",
-  Version = 2
-})
 
 local gaia_abundance_galah = {
   Identifier = "Gaia Abundance Galah",
@@ -39,7 +27,17 @@ local gaia_abundance_galah = {
     ColorMap = colorLUT .. "/colorbv.cmap",
     OtherDataColorMap = colorLUT .. "/viridis.cmap",
     StaticFilter = -9999,
-    StaticFilterReplacement = 0.0
+    StaticFilterReplacement = 0.0,
+    DataMapping = {
+      Bv = "colorb_v",
+      Luminance = "lum",
+      AbsoluteMagnitude = "absmag",
+      ApparentMagnitude = "appmag",
+      Vx = "vx",
+      Vy = "vy",
+      Vz = "vz",
+      Speed = "speed"
+    }
   },
   GUI = {
     Path = "/Milky Way/Gaia"
diff --git a/data/assets/scene/milkyway/milkyway/volume.asset b/data/assets/scene/milkyway/milkyway/volume.asset
index 76103612b3..0e54bd1535 100644
--- a/data/assets/scene/milkyway/milkyway/volume.asset
+++ b/data/assets/scene/milkyway/milkyway/volume.asset
@@ -32,16 +32,16 @@ local MilkyWayVolumeGalaxy = {
     Rotation = { 3.1415926, 3.1248, 4.45741 },
     Volume = {
       Type = "Volume",
-      Filename = data .. "/MilkyWayRGBAVolume1024x1024x128.raw",
+      Filename = openspace.absPath(data .. "/MilkyWayRGBAVolume1024x1024x128.raw"),
       Dimensions = { 1024, 1024, 128 },
       Size = { 1.2E21, 1.2E21, 0.15E21 },
       Downscale = 0.4,
     },
     Points = {
       Type = "Points",
-      Filename = data .. "/MilkyWayPoints.off",
+      Filename = openspace.absPath(data .. "/MilkyWayPoints.off"),
       EnabledPointsRatio = 0.3,
-      Texture = data .. "/halo.png"
+      Texture = openspace.absPath(data .. "/halo.png")
     }
   },
   GUI = {
diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
index 2325788c80..0abd320818 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
@@ -19,7 +19,17 @@ local OrionClusterStars = {
     ColorMap = sync .. "/colorbv.cmap",
     MagnitudeExponent = 5.02,
     SizeComposition = "Distance Modulus",
-    RenderMethod = "Texture Based"
+    RenderMethod = "Texture Based",
+    DataMapping = {
+      Bv = "colorb_v",
+      Luminance = "lum",
+      AbsoluteMagnitude = "absmag",
+      ApparentMagnitude = "appmag",
+      Vx = "vx",
+      Vy = "vy",
+      Vz = "vz",
+      Speed = "speed"
+    }
   },
   GUI = {
     Name = "Orion Nebula Star Cluster",
diff --git a/data/assets/scene/milkyway/stars/denver.asset b/data/assets/scene/milkyway/stars/denver.asset
index a1c2fbef55..4dc1621909 100644
--- a/data/assets/scene/milkyway/stars/denver.asset
+++ b/data/assets/scene/milkyway/stars/denver.asset
@@ -32,7 +32,17 @@ local object = {
     ColorMap = colorLUT .. "/denver_colorbv.cmap",
     MagnitudeExponent = 6.2,
     SizeComposition = "Distance Modulus",
-    RenderMethod = "Texture Based" -- or PSF
+    RenderMethod = "Texture Based", -- or PSF
+    DataMapping = {
+      Bv = "colorb_v",
+      Luminance = "lum",
+      AbsoluteMagnitude = "absmag",
+      ApparentMagnitude = "appmag",
+      Vx = "vx",
+      Vy = "vy",
+      Vz = "vz",
+      Speed = "speed"
+    }
   },
   GUI = {
     Name = "Stars (Denver)",
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
index fdf60a27e6..e2411ef264 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
@@ -27,21 +27,16 @@ local Charon = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/charon.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 40.0,
-      LabelsSize = 8.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 2000000.0,
-      FadeOutStartingDistance = 800000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 250000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 9.0,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      Distances = { 800000.0, 2000000.0 },
+      DistanceEPS = 250000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "planet_solarSystem", "planet_terrestrial" },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
index ee44ed93de..947b762858 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
@@ -27,21 +27,16 @@ local Pluto = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/pluto.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 28.0,
-      LabelsSize = 8.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 4000000.0,
-      FadeOutStartingDistance = 650000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 500000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 8.5,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 650000.0, 4000000.0 },
+      DistanceEPS = 500000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "planet_solarSystem", "planet_terrestrial" },
@@ -56,13 +51,12 @@ local PlutoLabel = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "Pluto",
-    FontSize = 100.0,
-    LabelSize = 8.9,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
+    Text = "Pluto",
+    FontSize = 70.0,
+    Size = 9.05,
+    MinMaxSize = { 1, 100 },
     BlendMode = "Additive",
-    LabelOrientationOption = "Camera View Direction"
+    OrientationOption = "Camera View Direction"
   },
   Tag = { "solarsystem_labels" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
index fc9f456e51..42e1e9dfd2 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
@@ -20,7 +20,8 @@ local PlutoTrailBarycentric = {
   Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" },
   GUI = {
     Name = "Pluto Barycentric Trail",
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto",
+    Description = [[Orbit of Pluto around it's Barycenter.]]
   }
 }
 
@@ -34,5 +35,6 @@ asset.meta = {
     NASA Spice (see base spice asset)]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
-  License = "MIT license"
+  License = "MIT license",
+  Identifiers = {"PlutoBarycentricTrail"}
 }
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
new file mode 100644
index 0000000000..95cc754503
--- /dev/null
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
@@ -0,0 +1,62 @@
+local assetHelper = asset.require('util/asset_helper')
+local transforms = asset.require('scene/solarsystem/sun/transforms')
+asset.require("spice/base")
+local kernels = asset.require('./kernels').PlutoKernels
+local OneAU = 1.496e+8
+local PlutoKeplerianTrail = {
+    Identifier = "PlutoKeplerianTrail",
+    Parent = transforms.SunECLIPJ2000.Identifier,
+    Renderable = {
+        Type = "RenderableTrailOrbit",
+        Translation = {
+            Type = "KeplerTranslation",
+            Eccentricity = 2.543033082909471E-01,
+            SemiMajorAxis = 3.974407237841206E+01 * OneAU,
+            Inclination = 1.736609481151430E+01,
+            AscendingNode = 1.102099981996057E+02,
+            ArgumentOfPeriapsis = 1.142248569189779E+02,
+            MeanAnomaly = 14.53,
+            Epoch = '2000 01 01 00:00',
+            Period = 7.82438e+9
+        },
+        Color = { 0.2, 0.8, 0.3 },
+        Period = 90487.27692706819,
+        Resolution = 1000,
+        Enabled = false
+    },
+    Tag = { "planetTrail_dwarf" },
+    GUI = {
+        Name = "Pluto Keplerian Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto",
+        Description = "Keplerian trail of Pluto. Contains full orbit."
+    }
+}
+assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoKeplerianTrail })
+
+
+asset.meta = {
+  Name = "Pluto Keplerian Trail",
+  Version = "1.0",
+  Description = [[ Full Keplerian trail of Pluto as observed by the Sun. Data from
+    JPL Horizons.]],
+  Author = "OpenSpace Team",
+  URL = "https://ssd.jpl.nasa.gov/sbdb.cgi?sstr=pluto",
+  License = "JPL/NASA",
+  Identifiers = {"PlutoKeplerianTrail"}
+}
+
+
+
+-- Double AscendingNode
+-- In range: ( 0.000000,360.000000 )
+-- This value determines the right ascension of the ascending node in degrees, that is the location of position along the orbit where the inclined plane and the horizonal reference plane intersect.
+-- Double ArgumentOfPeriapsis
+-- In range: ( 0.000000,360.000000 )
+-- This value determines the argument of periapsis in degrees, that is the position on the orbit that is closest to the orbiting body.
+-- Double MeanAnomaly
+-- In range: ( 0.000000,360.000000 )
+-- This value determines the mean anomaly at the epoch in degrees, which determines the initial location of the object along the orbit at epoch.
+-- EPOCH= 2457217.500000000 ! 2015-Jul-14 00:00 (TDB)
+--   EC= 2.543033082909471E-01 QR= 2.963702328762702E+01 IN= 1.736609481151430E+01
+--   OM= 1.102099981996057E+02 W = 1.142248569189779E+02 Tp=  2447885.610187903512
+--   A = 3.974407237841206E+01 AD= 4.985112146919710E+01 PR= 9.151809533192721E+04
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset
index 0a99b94527..0df3c771b8 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset
@@ -1,6 +1,7 @@
 asset.require('./trail')
 asset.require('./pluto')
 asset.require('./pluto_trail')
+asset.require('./pluto_trail_kepler')
 asset.require('./charon/charon')
 asset.require('./charon/charon_trail')
 asset.require('./minor/hydra')
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
index 689500df90..c309dce11b 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
@@ -23,7 +23,9 @@ local PlutoBarycenterTrail = {
   Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" },
   GUI = {
     Name = "Pluto Barycenter Trail",
-    Path = "/Solar System/Dwarf Planets/Pluto"
+    Path = "/Solar System/Dwarf Planets/Pluto",
+    Description = [[Precise trail of Pluto from NASA SPICE data. Not
+    containing full orbit.]]
   }
 }
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
index 01e7a4183f..349ad80572 100644
--- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
@@ -49,7 +49,7 @@ local Apollo15 = {
   },
   Renderable = {
     Type = "RenderableModel",
-    GeometryFile = models .. "/ApolloCSM.fbx",
+    GeometryFile = models .. "/ApolloCSM.osmodel",
     LightSources = {
       {
         Type = "SceneGraphLightSource",
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
index f1f8660e8e..19a8084f4e 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
@@ -50,7 +50,7 @@ local Apollo8LaunchModel = {
   },
   Renderable = {
     Type = "RenderableModel",
-    GeometryFile = models .. "/ApolloCSM.fbx",
+    GeometryFile = models .. "/ApolloCSM.osmodel",
     LightSources = {
       {
         Type = "SceneGraphLightSource",
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/model.asset b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
index ee208139d8..4399deb973 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
@@ -62,7 +62,7 @@ local Apollo8Model = {
   },
   Renderable = {
     Type = "RenderableModel",
-    GeometryFile = models .. "/ApolloCSM.fbx",
+    GeometryFile = models .. "/ApolloCSM.osmodel",
     LightSources = {
       {
         Type = "SceneGraphLightSource",
diff --git a/data/assets/scene/solarsystem/missions/apollo/csm_model.asset b/data/assets/scene/solarsystem/missions/apollo/csm_model.asset
index 048332b7d7..fb8c6b2165 100644
--- a/data/assets/scene/solarsystem/missions/apollo/csm_model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/csm_model.asset
@@ -2,7 +2,7 @@ local models = asset.syncedResource({
   Name = "Apollo Models",
   Type = "HttpSynchronization",
   Identifier = "apollo_models",
-  Version = 2
+  Version = 3
 })
 
 asset.export('models', models)
diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset
index 6a2b046a66..8231084142 100644
--- a/data/assets/scene/solarsystem/missions/insight/edl.asset
+++ b/data/assets/scene/solarsystem/missions/insight/edl.asset
@@ -60,33 +60,118 @@ local legDeployTime = "2018 NOV 26 19:43:06.68" -- entry + 243s
 local landerSeperationTime = "2018 NOV 26 19:44:51.68" -- entry + 348s
 local touchdownTime = "2018 NOV 26 19:45:32.68" -- entry + 389s
 local panelDeployTime = "2018 NOV 26 19:45:33.68" -- entry + 390s
-local foreverTime = "2018 NOV 26 20:17:50.68" -- entry + 2327s
 
 local kernelTouchdownTime = "2018 NOV 26 19:45:32.3"
 local spiceRotationEndTime = "2018 NOV 26 19:51:39"
 
-local InsightParent = {
-  Identifier = "InsightParent",
-  Parent = "MarsBarycenter",
-  Transform = {
-    Translation = {
+local TranslationKeyframes = {
+  ['1850 JAN 01 00:00:00'] = {
       Type = "SpiceTranslation",
       Target = "INSIGHT",
       Observer = "MARS",
-      Frame = "GALACTIC",
-      Kernels = iKernels
+      Frame = "IAU_MARS",
+      Kernels = iKernels,
+      FixedDate = '2018 NOV 26 19:39:03'
+  },
+  ['2018 NOV 26 19:39:02'] = {
+      Type = "SpiceTranslation",
+      Target = "INSIGHT",
+      Observer = "MARS",
+      Frame = "IAU_MARS",
+      Kernels = iKernels,
+      FixedDate = '2018 NOV 26 19:39:03'
+  },
+  ['2018 NOV 26 19:39:03'] = {
+    Type = "SpiceTranslation",
+    Target = "INSIGHT",
+    Observer = "MARS",
+    Frame = "IAU_MARS",
+    Kernels = iKernels
+  },
+  ['2018 NOV 26 19:39:04'] = {
+    Type = "SpiceTranslation",
+    Target = "INSIGHT",
+    Observer = "MARS",
+    Frame = "IAU_MARS",
+    Kernels = iKernels
+  },
+ ['2018 NOV 26 19:45:34'] = {
+    Type = "SpiceTranslation",
+    Target = "INSIGHT",
+    Observer = "MARS",
+    Frame = "IAU_MARS",
+    Kernels = iKernels
+  },
+  ['2018 NOV 26 19:45:35'] = {
+      Type = "SpiceTranslation",
+      Target = "INSIGHT",
+      Observer = "MARS",
+      Frame = "IAU_MARS",
+      Kernels = iKernels,
+      FixedDate = '2018 NOV 26 19:45:34'
+  },
+}
+
+local RotationKeyframes = {
+  ['1850 JAN 01 00:00:00'] = {
+    Type = "SpiceRotation",
+    SourceFrame = "INSIGHT_LANDER_CRUISE",
+    DestinationFrame = "IAU_MARS",
+    FixedDate = '2018 NOV 26 19:39:02',
+    Kernels = iKernels
+  },
+  ['2018 NOV 26 19:39:02'] = {
+    Type = "SpiceRotation",
+    SourceFrame = "INSIGHT_LANDER_CRUISE",
+    DestinationFrame = "IAU_MARS",
+    FixedDate = '2018 NOV 26 19:39:02',
+    Kernels = iKernels
+  },
+  ['2018 NOV 26 19:39:03'] = {
+    Type = "SpiceRotation",
+    SourceFrame = "INSIGHT_LANDER_CRUISE",
+    DestinationFrame = "IAU_MARS",
+    Kernels = iKernels
+  },
+  ['2018 NOV 26 19:39:04'] = {
+    Type = "SpiceRotation",
+    SourceFrame = "INSIGHT_LANDER_CRUISE",
+    DestinationFrame = "IAU_MARS",
+    Kernels = iKernels
+  },
+ ['2018 NOV 26 19:45:34'] = {
+    Type = "SpiceRotation",
+    SourceFrame = "INSIGHT_LANDER_CRUISE",
+    DestinationFrame = "IAU_MARS",
+    Kernels = iKernels
+  },
+  ['2018 NOV 26 19:45:35'] = {
+    Type = "SpiceRotation",
+    SourceFrame = "INSIGHT_LANDER_CRUISE",
+    DestinationFrame = "IAU_MARS",
+    FixedDate = '2018 NOV 26 19:45:34'
+  },
+}
+
+
+local InsightParent = {
+  Identifier = "InsightParent",
+  Parent = "Mars",
+  Transform = {
+    Translation ={
+      Type = "TimelineTranslation",
+      Keyframes = TranslationKeyframes,
     },
     Rotation = {
-      Type = "SpiceRotation",
-      SourceFrame = "INSIGHT_LANDER_CRUISE",
-      DestinationFrame = "GALACTIC"
+      Type = "TimelineRotation",
+      Keyframes = RotationKeyframes,
     }
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = spiceRotationEndTime
-  },
+  -- TimeFrame = {
+  --   Type = "TimeFrameInterval",
+  --   Start = entryTimeStart,
+  --   End = spiceRotationEndTime
+  -- },
   GUI = {
     Hidden = true,
     Name = "InsightParent",
@@ -121,7 +206,6 @@ local Insight_Entry_CapsuleA = {
   },
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = entryTimeStart,
     End = landerSeperationTime
   },
   GUI = {
@@ -142,7 +226,6 @@ local Insight_Entry_Capsule_Ring = {
   },
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = entryTimeStart,
     End = landerSeperationTime
   },
   GUI = {
@@ -163,7 +246,6 @@ local Insight_Entry_Capsule_Plugs = {
   },
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = entryTimeStart,
     End = landerSeperationTime
   },
   GUI = {
@@ -184,7 +266,6 @@ local Insight_Entry_Heatshield = {
   },
   TimeFrame = {
     Type = "TimeFrameInterval",
-    Start = entryTimeStart,
     End = heatShieldSeperationTime
   },
   GUI = {
@@ -329,11 +410,6 @@ local Insight_Lander_A001 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources,
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight Lander A001",
@@ -350,11 +426,6 @@ local Insight_Lander_A002 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources,
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight Lander A002",
@@ -371,11 +442,6 @@ local Insight_Lander_A003 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources,
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight Lander A003",
@@ -392,11 +458,6 @@ local Insight_Lander_A004 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources,
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight Lander A004",
@@ -413,11 +474,6 @@ local Insight_Lander_A005 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources,
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight Lander A005",
@@ -434,11 +490,6 @@ local Insight_Lander_A006 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources,
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight Lander A006",
@@ -455,11 +506,6 @@ local Insight_Lander_A007 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources,
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight Lander A007",
@@ -476,11 +522,6 @@ local Insight_Lander_A008 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources,
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight Lander A008",
@@ -497,11 +538,6 @@ local Insight_Lander_foil1 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources,
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight Lander foil",
@@ -518,11 +554,6 @@ local Insight_Lander_Tex01 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources,
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight Lander Tex01",
@@ -539,11 +570,6 @@ local Insight_Lander_Tex02 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources,
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight Lander Tex02",
@@ -605,7 +631,6 @@ local Insight_Legs_Deployed_tex = {
   TimeFrame = {
     Type = "TimeFrameInterval",
     Start = legDeployTime,
-    End = foreverTime
   },
   GUI = {
     Hidden = true,
@@ -626,7 +651,6 @@ local Insight_Legs_Deployed_AO06 = {
   TimeFrame = {
     Type = "TimeFrameInterval",
     Start = legDeployTime,
-    End = foreverTime
   },
   GUI = {
     Hidden = true,
@@ -644,11 +668,6 @@ local Insight_Panels_Stowed_tex = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight panels_stow_tex",
@@ -665,11 +684,6 @@ local Insight_Panels_Stowed_tex2 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight panels_stow_tex2",
@@ -686,11 +700,6 @@ local Insight_Panels_Stowed_AO01 = {
     ModelTransform = RotationMatrix,
     LightSources = LightSources
   },
-  TimeFrame = {
-    Type = "TimeFrameInterval",
-    Start = entryTimeStart,
-    End = foreverTime
-  },
   GUI = {
     Hidden = true,
     Name = "Insight panels_stow_AO",
@@ -710,7 +719,6 @@ local Insight_Panels_Deployed_tex = {
   TimeFrame = {
     Type = "TimeFrameInterval",
     Start = panelDeployTime,
-    End = foreverTime
   },
   GUI = {
     Hidden = true,
@@ -731,7 +739,6 @@ local Insight_Panels_Deployed_tex2 = {
   TimeFrame = {
     Type = "TimeFrameInterval",
     Start = panelDeployTime,
-    End = foreverTime
   },
   GUI = {
     Hidden = true,
@@ -752,7 +759,6 @@ local Insight_Panels_Deployed_AO06 = {
   TimeFrame = {
     Type = "TimeFrameInterval",
     Start = panelDeployTime,
-    End = foreverTime
   },
   GUI = {
     Hidden = true,
diff --git a/data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset b/data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset
new file mode 100644
index 0000000000..7f45814a94
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/jwst/HUDFImage.asset
@@ -0,0 +1,77 @@
+local assetHelper = asset.require('util/asset_helper')
+local transforms = asset.require('scene/solarsystem/planets/earth/transforms')
+local jwstTransforms = asset.require('scene/solarsystem/missions/jwst/jwst')
+local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
+
+local image = asset.syncedResource({
+  Name = "HUDF image",
+  Type = "HttpSynchronization",
+  Identifier = "hudf_image",
+  Version = 1
+})
+
+local DISTANCE = 9.2E15;
+
+-- ra = 3h32m38.92s
+-- dec = -27d47m29.37s
+-- distance = 9.2E15 m (set to size of view sphere)
+local HUDFPosition = {
+  Identifier = "HUDFPosition",
+  Parent = transforms.EarthInertial.Identifier,
+  Transform = {
+    Translation = {
+      Type = "StaticTranslation",
+      Position = {
+        0.53039024 * DISTANCE,
+        0.70802069 * DISTANCE,
+        -0.46625412 * DISTANCE
+      }
+    }
+  },
+  GUI = {
+    Name = "Hubble Ultra Deep field",
+    Path = "/Solar System/Missions/JWST",
+    Hidden = true
+  }
+}
+
+local HUDFImage = {
+  Identifier = "HUDFImage",
+  Enabled = false,
+  Type = "ScreenSpaceImageLocal",
+  Name = "Hubble Ultra Deep field",
+  UseRadiusAzimuthElevation = true,
+  FaceCamera = false,
+  RadiusAzimuthElevation = { 200.0, 0.5, 0.15 },
+  UsePerspectiveProjection = false,
+  Opacity = 1.0,
+  TexturePath = image .. "/Hubble_ultra_deep_field.jpg",
+  Tag = { "mission_jwst_hudf" },
+}
+
+local HUDFJWSTLine = {
+  Identifier = "HUDFJWSTLine",
+  Parent = sunTransforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderableNodeLine",
+    StartNode = HUDFPosition.Identifier,
+    EndNode = jwstTransforms.JWSTPosition.Identifier,
+    Color = { 0.5, 0.5, 0.5 },
+    LineWidth = 2
+  },
+  Tag = { "mission_jwst_hudf" },
+  GUI = {
+    Name = "JWST to HUDF Line",
+    Path = "/Solar System/Missions/JWST",
+  }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { HUDFPosition, HUDFImage, HUDFJWSTLine })
+
+asset.onInitialize(function()
+  openspace.addScreenSpaceRenderable(HUDFImage)
+end)
+asset.onDeinitialize(function()
+  openspace.removeScreenSpaceRenderable(HUDFImage.Identifier)
+end)
diff --git a/data/assets/scene/solarsystem/missions/jwst/jwst.asset b/data/assets/scene/solarsystem/missions/jwst/jwst.asset
new file mode 100644
index 0000000000..a0c86521e4
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/jwst/jwst.asset
@@ -0,0 +1,304 @@
+local assetHelper = asset.require('util/asset_helper')
+local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
+
+asset.require('spice/base')
+asset.require('scene/solarsystem/planets/earth/lagrange_points/lagrange_points')
+local transforms = asset.require('scene/solarsystem/planets/earth/lagrange_points/L2')
+
+local JWSTKernel = asset.syncedResource({
+  Name = "JWST Kernel",
+  Type = "HttpSynchronization",
+  Identifier = "jwst_kernels",
+  Version = 1
+})
+
+--[[local JWSTHorizons = asset.syncedResource({
+  Name = "JWST Horizons",
+  Type = "HttpSynchronization",
+  Identifier = "jwst_horizons",
+  Version = 1
+})]]--
+
+local model = asset.syncedResource({
+  Name = "JWST Model",
+  Type = "HttpSynchronization",
+  Identifier = "jwst_model",
+  Version = 1
+})
+
+local band = asset.syncedResource({
+  Name = "JWST band texture",
+  Type = "HttpSynchronization",
+  Identifier = "jwst_band_texture",
+  Version = 1
+})
+
+local JWSTPosition = {
+  Identifier = "JWSTPosition",
+  Parent = transforms.L2.Identifier,
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "JWST",
+      Observer = "392", -- L2
+      Kernels = JWSTKernel .. "/jwst_horizons_20200101_20240101_v01.bsp"
+    },
+  },
+  GUI = {
+    Name = "JWST Position",
+    Path = "/Solar System/Missions/JWST",
+    Hidden = true,
+  }
+}
+
+local JWSTRotation = {
+  Identifier = "JWSTRotation",
+  Parent = JWSTPosition.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "FixedRotation",
+      Attached = "JWSTRotation",
+      XAxis = { 1, 0, 0 },
+      XAxisOrthogonal = true,
+      YAxisInvert = true,
+      YAxis = sunTransforms.SolarSystemBarycenter.Identifier
+    }
+  },
+  GUI = {
+    Name = "JWST Rotation",
+    Path = "/Solar System/Missions/JWST",
+    Hidden = true,
+  }
+}
+
+local JWSTBand = {
+  Identifier = "JWSTBand",
+  Parent = JWSTPosition.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "FixedRotation",
+      Attached = "JWSTBand",
+      XAxis = { 1, 0, 0 },
+      XAxisOrthogonal = true,
+      ZAxis = sunTransforms.SolarSystemBarycenter.Identifier
+    }
+  },
+  Renderable = {
+    Enabled = false,
+    Type = "RenderableSphere",
+    Texture = band .. "/JWST-band.png",
+    Size = 9.2E15,
+    Segments = 50,
+    DisableFadeInOut = true,
+    Orientation = "Inside",
+    Opacity = 0.05,
+    UseAdditiveBlending = true,
+  },
+  Tag = { "mission_jwst_fov" },
+  GUI = {
+    Name = "JWST Safe Viewing Band",
+    Path = "/Solar System/Missions/JWST"
+  }
+}
+
+local JWSTModel = {
+  Identifier = "JWSTModel",
+  Parent = JWSTRotation.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = "2020 JAN 01",
+    End = "2024 JAN 01"
+  },
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = model .. "/JWSTFBX.osmodel",
+    ModelScale = "Foot",
+    InvertModelScale = true,
+    EnableAnimation = true,
+    --TODO: Update theese when the new animation is finished
+    AnimationStartTime = "2018 10 01 15:00:00",
+    AnimationMode = "Once",
+    LightSources = {
+      {
+        Type = "SceneGraphLightSource",
+        Identifier = "Sun",
+        Node = sunTransforms.SolarSystemBarycenter.Identifier,
+        Intensity = 1.0
+      }
+    },
+    PerformShading = true,
+    DisableFaceCulling = true
+  },
+  GUI = {
+    Name = "James Webb Space Telescope",
+    Path = "/Solar System/Missions/JWST",
+  }
+}
+
+local JWSTTrail = {
+  Identifier = "JWSTTrail",
+  Parent = transforms.L2.Identifier,
+  Renderable = {
+    Type = "RenderableTrailOrbit",
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "JWST",
+      Observer = "392", -- L2
+      Kernels = JWSTKernel .. "/jwst_horizons_20200101_20240101_v01.bsp"
+    },
+    Color = { 0.9, 0.9, 0.0 },
+    Period = 91.3105,
+    Resolution = 100
+  },
+  GUI = {
+    Name = "JWST Trail",
+    Path = "/Solar System/Missions/JWST"
+  }
+}
+
+local JWSTSunTrail = {
+  Identifier = "JWSTSunTrail",
+  Parent = sunTransforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderableTrailOrbit",
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "JWST",
+      Observer = "SUN",
+      Kernels = JWSTKernel .. "/jwst_horizons_20200101_20240101_v01.bsp"
+    },
+    Color = { 0.0, 0.9, 0.9 },
+    Period = 365.242,
+    Resolution = 1000
+  },
+  GUI = {
+    Name = "JWST Sun Trail",
+    Path = "/Solar System/Missions/JWST"
+  }
+}
+
+local JWSTFov = {
+  Identifier = "JWSTFov",
+  Parent = JWSTModel.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderablePrism",
+    Segments = 6,
+    Lines = 3,
+    Radius = 3.25,
+    LineWidth = 1.0,
+    Color = { 1.0, 1.0, 1.0 },
+    Length = 9.2E15
+  },
+  Transform = {
+    Rotation = {
+      Type = "StaticRotation",
+      Rotation = { 0, 0, math.rad(30) }
+    },
+  },
+  Tag = { "mission_jwst_fov" },
+  GUI = {
+    Name = "JWST Field of View",
+    Path = "/Solar System/Missions/JWST",
+  }
+}
+
+-- Launch, coming soon
+--[[local JWSTLaunchPosition = {
+  Identifier = "JWSTLaunchPosition",
+  Parent = transforms.L2.Identifier,
+  Transform = {
+    Translation = {
+      Type = "HorizonsTranslation",
+      HorizonsTextFile = JWSTHorizons .. "/horizons_jwst_launch.dat",
+    },
+  },
+  GUI = {
+    Name = "JWST Launch Position",
+    Path = "/Solar System/Missions/JWST",
+    Hidden = true,
+  }
+}
+
+local JWSTLaunchModel = {
+  Identifier = "JWSTLaunchModel",
+  Parent = JWSTLaunchPosition.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = "2018 OCT 01 13:18:00",
+    End = "2019 OCT 01"
+  },
+  Transform = {
+    Rotation = {
+      Type = "FixedRotation",
+      Attached = "JWSTRotation",
+      XAxis = { 1, 0, 0 },
+      XAxisOrthogonal = true,
+      YAxisInvert = true,
+      YAxis = sunTransforms.SolarSystemBarycenter.Identifier
+    }
+  },
+  Renderable = {
+    Type = "RenderableModel",
+    GeometryFile = model .. "/JWSTFBX.osmodel",
+    ModelScale = "Foot",
+    InvertModelScale = true,
+    EnableAnimation = true,
+    --TODO: Update theese when the new animation is finished
+    AnimationStartTime = "2018 10 01 15:00:00",
+    AnimationMode = "Once",
+    LightSources = {
+      {
+        Type = "SceneGraphLightSource",
+        Identifier = "Sun",
+        Node = sunTransforms.SolarSystemBarycenter.Identifier,
+        Intensity = 1.0
+      }
+    },
+    PerformShading = true,
+    DisableFaceCulling = true
+  },
+  GUI = {
+    Name = "JWST Launch Model",
+    Path = "/Solar System/Missions/JWST",
+  }
+}
+
+local JWSTLaunchTrail = {
+  Identifier = "JWSTLaunchTrail",
+  Parent = transforms.L2.Identifier,
+  TimeFrame = {
+    Type = "TimeFrameInterval",
+    Start = "2018 OCT 01 13:18:00",
+    End = "2019 OCT 01"
+  },
+  Renderable = {
+    Type = "RenderableTrailTrajectory",
+    Translation = {
+      Type = "HorizonsTranslation",
+      HorizonsTextFile = JWSTHorizons .. "/horizons_jwst_launch.dat",
+    },
+    Color = { 0.9, 0.9, 0.0 },
+    StartTime = "2018 OCT 01 13:18:00",
+    EndTime = "2019 OCT 01",
+    SampleInterval = 600
+  },
+  GUI = {
+    Name = "JWST Launch Trail",
+    Path = "/Solar System/Missions/JWST"
+  }
+}]]--
+
+assetHelper.registerSceneGraphNodesAndExport(asset, {
+  JWSTTrail,
+  JWSTSunTrail,
+  --JWSTLaunchTrail,
+  JWSTPosition,
+  --JWSTLaunchPosition,
+  JWSTRotation,
+  JWSTBand,
+  JWSTModel,
+  --JWSTLaunchModel,
+  JWSTFov
+})
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
index ea0377a3a9..ba0442a4eb 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
@@ -1,17 +1,10 @@
 local assetHelper = asset.require('util/asset_helper')
 local transforms = asset.require('./transforms')
 local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
-
-local models = asset.syncedResource({
-  Name = "Bennu Models",
-  Type = "HttpSynchronization",
-  Identifier = "bennu_models",
-  Version = 1
-})
+local models = asset.require('./models').models
 
 local BENNU_BODY = "2101955"
 
-
 local Bennu = {
   Identifier = "Bennu",
   Parent = transforms.BennuBarycenter.Identifier,
@@ -20,56 +13,17 @@ local Bennu = {
       Type = "SpiceRotation",
       SourceFrame = "IAU_BENNU",
       DestinationFrame = "GALACTIC"
+    },
+    Scale = {
+      Type = "StaticScale",
+      Scale = 1000.0
     }
   },
   Renderable = {
-    Type = "RenderableModelProjection",
+    Enabled = false,
+    Type = "RenderableModel",
     Body = BENNU_BODY,
-    GeometryFile = models .. "/BennuUntextured.obj",
-    Projection = {
-      Sequence   = asset.localResource('InstrumentTimes'),
-      SequenceType = "instrument-times",
-      Observer   = "OSIRIS-REX",
-      Target     = BENNU_BODY,
-      Aberration = "NONE",
-      AspectRatio = 2,
-
-      DataInputTranslation = {
-        Instruments = {
-          ORX_OCAMS_POLYCAM = {
-            DetectorType = "Camera",
-            Spice = { "ORX_OCAMS_POLYCAM" },
-            Files = {
-              "BaseballDiamond_PolyCam.txt",
-              --"OrbitalB_Site08_PolyCamImages.txt",
-              "Recon_225m_Equatorial_PolyCam.txt"
-            }
-          },
-          ORX_REXIS = {
-            DetectorType = "Camera",
-            Spice = { "ORX_REXIS" },
-            Files = {
-              "DetailedSurvey_EquatorialStations_Spectrometers.txt", 
-              "Recon_225m_Equatorial_spectrometers.txt",
-              "Recon_525m_Equatorial_spectrometers.txt"
-            }
-          }
-        },
-        Target = {
-          Body = BENNU_BODY
-        },
-      },
-
-      Instrument = { -- INVALID DATA - JUST FOR TESTING
-        Name       = "ORX_OCAMS_POLYCAM",
-        Method     = "ELLIPSOID",
-        Aberration = "NONE",
-        Fovy       = 0.792,
-        Aspect     = 1,
-        Near       = 0.01,
-        Far        = 1000000
-      }
-    }
+    GeometryFile = models .. "/Bennu_v20_200k.stl",
   },
   GUI = {
     Path = "/Solar System/Asteroid"
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset
new file mode 100644
index 0000000000..ae2b0add47
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu_projection.asset
@@ -0,0 +1,104 @@
+local assetHelper = asset.require('util/asset_helper')
+local transforms = asset.require('./transforms')
+local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
+
+local models = asset.require('./models').models
+
+local BENNU_BODY = "2101955"
+
+local images = asset.syncedResource({
+  Name = "Bennu Images Approach",
+  Type = "HttpSynchronization",
+  Identifier = "osirisrex_bennu_images_approach",
+  Version = 1
+})
+
+local imagesA = asset.syncedResource({
+  Name = "Bennu Images A",
+  Type = "HttpSynchronization",
+  Identifier = "osirisrex_bennu_images_orbit_a",
+  Version = 1
+})
+
+local BennuProjection = {
+  Identifier = "BennuProjection",
+  Parent = transforms.BennuBarycenter.Identifier,
+  Transform = {
+    Rotation = {
+      Type = "SpiceRotation",
+      SourceFrame = "IAU_BENNU",
+      DestinationFrame = "GALACTIC"
+    },
+  },
+  Renderable = {
+    Enabled = true,
+    Type = "RenderableModelProjection",
+    Body = BENNU_BODY,
+    GeometryFile = models .. "/BennuTextured.obj",
+    Projection = {
+      Sequence   = { images, imagesA },
+      SequenceType = "image-sequence",
+      Observer   = "OSIRIS-REX",
+      Target     = BENNU_BODY,
+      Aberration = "NONE",
+      TextureMap = true,
+      DataInputTranslation = {
+        Instruments = {
+          ORX_OCAMS_POLYCAM = {
+            DetectorType = "Camera",
+            Spice = { "ORX_OCAMS_POLYCAM" },
+          },
+        },
+        Target = { 
+          Read  = {
+            "TARGET_NAME",
+            "INSTRUMENT_HOST_NAME",
+            "INSTRUMENT_ID",
+            "START_TIME",
+            "STOP_TIME"
+          },
+          Convert = {
+            ["2101955"] = { "2101955" },
+            ["OSIRIS-REX"] = { "OSIRIS-REX" },
+            ["ORX_OCAMS_POLYCAM"] = { "ORX_OCAMS_POLYCAM" },
+          }
+        }
+      },
+      Instrument = { -- INVALID DATA - JUST FOR TESTING
+        Name = "ORX_OCAMS_POLYCAM",
+        Method = "ELLIPSOID",
+        Aberration = "NONE",
+        Fovy = 0.792,
+        Aspect = 1,
+        Near = 0.01,
+        Far = 1000000
+      }
+    }
+  },
+  GUI = {
+    Path = "/Solar System/Asteroid"
+  }
+}
+
+local BennuTrail = {
+  Identifier = "BennuTrail",
+  Parent = sunTransforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Type = "RenderableTrailTrajectory",
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = BENNU_BODY,
+      Observer = "SUN"
+    },
+    Color = { 0.4, 0.0, 0.7 },
+    StartTime = "2015 JAN 01 00:00:00.000",
+    EndTime = "2023 MAY 31 00:00:00.000",
+    SampleInterval = 3600
+  },
+  GUI = {
+    Name = "Bennu Trail",
+    Path = "/Solar System/Asteroid"
+  }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { BennuProjection, BennuTrail })
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset b/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset
new file mode 100644
index 0000000000..bb4f1ffca2
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/osirisrex/imageplane.asset
@@ -0,0 +1,43 @@
+local assetHelper = asset.require('util/asset_helper')
+local transforms = asset.require('./transforms')
+
+local textures = asset.syncedResource({
+  Name = "Bennu Textures",
+  Type = "HttpSynchronization",
+  Identifier = "bennu_textures",
+  Version = 1
+})
+
+local BENNU_BODY = "2101955"
+
+local ImagePlane = {
+  Identifier = "ImagePlaneBennu",
+  Parent = transforms.BennuBarycenter.Identifier,
+  Transform = {
+    -- Translation = {
+    --     Type = "StaticTranslation",
+    --     Position = { -0.2476, 0.2710, 0.3364 }
+    -- },
+    -- Rotation = {
+    --     Type = "SpiceRotation",
+    --     SourceFrame = "ORX_OCAMS_POLYCAM",
+    --     DestinationFrame = "ORX_SPACECRAFT"
+    -- }
+  },
+  Renderable = {
+    Type = "RenderablePlaneProjection",
+    Frame = "IAU_BENNU",
+    DefaultTarget = BENNU_BODY,
+    Spacecraft = "OSIRIS-REX",
+    Instrument = "ORX_OCAMS_POLYCAM",
+    Moving = false,
+    Texture = textures .. "/defaultProj.png"
+  },
+  GUI = {
+    Name = "OsirisREx Image Plane",
+    Path = "/Solar System/Missions/OSIRIS REx"
+  }
+}
+
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { ImagePlane })
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset b/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset
new file mode 100644
index 0000000000..85e56d5fa1
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/osirisrex/kernels.asset
@@ -0,0 +1,91 @@
+local kernels = asset.syncedResource({
+  Name = "Osiris Rex Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "osirisrex_kernels",
+  Version = 2
+})
+  
+local OsirisRexKernels = {
+  kernels .. "/orx_v14.tf",
+  kernels .. "/orx_ocams_v07.ti",
+  kernels .. "/orx_rexis_v01.ti",
+  kernels .. "/ORX_SCLKSCET.00061.tsc",
+  kernels .. "/bennu_v17.tpc",
+  kernels .. "/orx_struct_v04.bsp",
+  kernels .. "/orx_sa_red_200106_v02.bc",
+  kernels .. "/orx_sa_red_200107_v02.bc",
+  kernels .. "/orx_sa_red_200108_v02.bc",
+  kernels .. "/orx_sa_red_200109_v02.bc",
+  kernels .. "/orx_sa_red_200110_v02.bc",
+  kernels .. "/orx_sa_rel_200106_200112_v01.bc",
+  kernels .. "/orx_sc_rel_160909_160911_v01.bc",
+  kernels .. "/orx_sc_rel_160912_160918_v01.bc",
+  kernels .. "/orx_sc_rel_160919_160925_v01.bc",
+  kernels .. "/orx_sc_rel_160926_161002_v01.bc",
+  kernels .. "/orx_sc_rel_181029_181104_v02.bc",
+  kernels .. "/orx_sc_rel_190218_190224_v02.bc",
+  kernels .. "/orx_sc_rel_200106_200112_v01.bc",
+  kernels .. "/orx_sc_rel_201019_201025_v01.bc",
+  kernels .. "/orx_sc_rel_201012_201018_v01.bc",
+  kernels .. "/orx_sc_red_200106_v02.bc",
+  kernels .. "/orx_sc_red_200107_v02.bc",
+  kernels .. "/orx_sc_red_200108_v02.bc",
+  kernels .. "/orx_sc_red_200109_v02.bc",
+  kernels .. "/orx_sc_red_201020_v02.bc",
+  kernels .. "/orx_sc_red_201017_v03.bc",
+  kernels .. "/orx_sc_red_201018_v02.bc",
+  kernels .. "/orx_sc_red_201019_v02.bc",
+  kernels .. "/orx_r_160909_160910_v01.bc",
+  kernels .. "/orx_r_160910_160913_v01.bc",
+  kernels .. "/orx_r_160913_160915_v01.bc",
+  kernels .. "/orx_r_160915_160919_v01.bc",
+  kernels .. "/orx_r_160918_160922_v01.bc",
+  kernels .. "/orx_r_160919_160922_v01.bc",
+  kernels .. "/orx_r_200105_200107_v02.bc",
+  kernels .. "/orx_r_200106_200108_v02.bc",
+  kernels .. "/orx_r_200107_200109_v02.bc",
+  kernels .. "/orx_r_200107_200112_v01.bc",
+  kernels .. "/orx_r_200108_200110_v02.bc",
+  kernels .. "/orx_r_200109_200111_v02.bc",
+  kernels .. "/orx_r_201019_201021_v06.bc",
+  kernels .. "/orx_r_201018_201021_v02.bc",
+  kernels .. "/orx_r_201018_201020_v03.bc",
+  kernels .. "/orx_r_201017_201019_v03.bc",
+  kernels .. "/orx_p_160910_161005_xc001b_v01.bc",
+  kernels .. "/orx_p_200106_200113_2002_od205_v01.bc",
+  kernels .. "/orx_p_200106_200113_2002_od209_v01.bc",
+  kernels .. "/orx_p_200106_200113_2002_od210_v01.bc",
+  kernels .. "/orx_p_201019_201026_2043tag_od293_v03.bc",
+  kernels .. "/orx_p_201012_201019_2042_od291_v04.bc",
+  kernels .. "/orx_p_210411_210510_xq006_od297_v05.bc",
+  kernels .. "/orx_p_210509_210513_xr001_adm_final_mod_od311_v01.bc",
+  kernels .. "/orx_p_210509_210607_xr001_od298_v00.bc",
+  kernels .. "/orx_p_230824_231008_src_release_od298_v00.bc",
+  kernels .. "/OREX_20160904_M45_complete.bsp",
+  kernels .. "/OREX_20160908_M60_complete.bsp",
+  kernels .. "/orx_struct_polycam_v01.bc",
+  kernels .. "/de424.bsp",
+  kernels .. "/bennu_refdrmc_v1.bsp",
+  kernels .. "/orx_160908_231024_pgaa2_day06m60.bsp",
+  kernels .. "/orx_160908_231024_pgaa3_day06m60_v1.bsp",
+  kernels .. "/orx_160909_161228_160919_od005_tcm1_v2.bsp",
+  kernels .. "/orx_160909_161228_160930_od006_tcm1_v1.bsp",
+  kernels .. "/orx_160909_170101_160912_od004_v1.bsp",
+  kernels .. "/orx_160909_170101_161010_od008_v1.bsp",
+  kernels .. "/spk_orx_160908_231024_pgaa2_day06m60_v3.bsp",
+  kernels .. "/orx_160909_231024_refod009_v2.bsp",
+  kernels .. "/orx_171006_231024_171005_refod027_v1.bsp",
+  kernels .. "/orx_180301_200101_180711_od037-R-AM1-P-M17B_v2.bsp",
+  kernels .. "/orx_180801_181219_181128_od066-N-M0P-L-VC1_v1.bsp",
+  kernels .. "/orx_191101_200407_191202_od204-R-R1P1-P-R3R_v1.bsp",
+  kernels .. "/orx_201020_210524_210103_od297-N-PTO1-F_v1.bsp",
+  kernels .. "/orx_201020_210601_201109_od295-R_v1.bsp",
+  kernels .. "/orx_201020_201110_201021_od293-N_v1.bsp",
+  kernels .. "/orx_201005_201201_200615_od258-R-T1P1-P-T1R1_v1.bsp",
+  kernels .. "/orx_201005_201201_200615_od258-C-T1P1-P-T1R5_v2.bsp",
+  kernels .. "/orx_210115_210701_210426_od310-N-ADM-P_v1.bsp",
+  kernels .. "/orx_210408_210701_210503_od311-N-ADM-F_v1.bsp",
+  kernels .. "/orx_210509_231025_210119_od298-R-ADM1-P-DB1_v1.bsp"
+}
+
+asset.export('kernels', OsirisRexKernels)
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
index 454d4462e3..0af62025e7 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
@@ -3,173 +3,17 @@ local transforms = asset.require('./transforms')
 local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
 local earthTransforms = asset.require('scene/solarsystem/planets/earth/transforms')
 
-
-
-local kernels = asset.syncedResource({
-  Name = "Osiris Rex Kernels",
-  Type = "HttpSynchronization",
-  Identifier = "osirisrex_kernels",
-  Version = 1
-})
+local OsirisRexKernels = asset.require('./kernels').kernels
 
 local models = asset.syncedResource({
   Name = "Osiris Rex Models",
   Type = "HttpSynchronization",
   Identifier = "osirisrex_models",
-  Version = 2
+  Version = 3
 })
 
 local BENNU_BODY = "2101955"
 
-KernelCase = 2 -- Right now we only have the image times for case 2
-
-local CaseDependentKernels
-if KernelCase == 2 then
-  CaseDependentKernels = {
-    kernels .. "/ORX_Recon_525mSortie_Case02.bsp",
-    kernels .. "/Recon_525mSortie_Case02_0Latitude.bc",
-    kernels .. "/Recon_525mSortie_Case02_atl_19145_04.atf",
-
-    kernels .. "/ORX_Recon_225mSortie_Case02.bsp",
-    kernels .. "/Recon_225mSortie_Case02_0Latitude.bc"
-  }
-elseif KernelCase == 5 then
-  CaseDependentKernels = {
-    kernels .. "/ORX_Recon_525mSortie_Case05.bsp",
-    kernels .. "/Recon_525mSortie_Case05_20negLatitude.bc",
-    kernels .. "/Recon_525mSortie_Case05_atl_19145_04.atf",
-    kernels .. "/Recon_525mSortie_Case05_NominalProfile.bc",
-
-    kernels .. "/ORX_Recon_225mSortie_Case05.bsp",
-    kernels .. "/Recon_225mSortie_Case05_20negLatitude.bc"
-  }
-elseif KernelCase == 8 then
-  CaseDependentKernels = {
-    kernels .. "/Recon_525mSortie_Case08_NominalProfile.bc",
-    kernels .. "/ORX_Recon_225mSortie_Case08.bsp",
-    kernels .. "/Recon_225mSortie_Case08_40negLatitude.bc"
-  }
-elseif KernelCase == 11 then
-  CaseDependentKernels = {
-    kernels .. "/ORX_Recon_225mSortie_Case11.bsp",
-    kernels .. "/Recon_225mSortie_Case11_60negLatitude.bc"
-  }
-end
-
-local OsirisRexKernels = {
-    -- background 
-  -- SCLK kernels needs to be loaded before CK kernels (and generally first)
-  kernels .. "/ORX_SCLKSCET.00000.tsc",
-
-  -- This cannot be loaded correctly for some reason!
-  --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/background/dsk/RQ36mod.oct12_CCv0001.bds")
-  
-  kernels .. "/orx_v04.tf",
-  kernels .. "/orx_lidar_v00.ti",
-  kernels .. "/orx_ocams_v03.ti",
-  kernels .. "/orx_otes_v00.ti",
-  kernels .. "/orx_rexis_v00.ti",
-  kernels .. "/orx_struct_v00.ti",
-  kernels .. "/orx_navcam_v00.ti",
-  kernels .. "/orx_ola_v00.ti",
-  kernels .. "/orx_ovirs_v00.ti",
-  kernels .. "/orx_stowcam_v00.ti",
-  -- kernels .. "/naif0011.tls",
-  kernels .. "/bennu_SPH250m.tpc",
-  kernels .. "/bennu_v10.tpc",
-
-  -- Low res SPK
-  kernels .. "/orx_160917_231024_pgaa3_day15m60_v1.bsp",
-  kernels .. "/orx_160914_231024_pgaa3_day12m60_v1.bsp",
-  
-  kernels .. "/orx_160908_231024_pgaa3_day06m60_v1.bsp",
-  kernels .. "/spk_orx_160908_231024_pgaa2_day06m60_v3.bsp",
-  kernels .. "/orx_160908_231024_pgaa2_day06m60.bsp",
-
-  kernels .. "/OREX_20160908_M60_complete.bsp",
-  kernels .. "/OREX_20160904_M45_complete.bsp",
-
-  -- SPK
-  kernels .. "/de421.bsp",
-  kernels .. "/sb-101955-76.bsp",
-
-  -- Nominal_Profile_LowRes
-  kernels .. "/Approach_600s_20180816T230000_20181119T010000.bsp",
-  kernels .. "/Approach_NominalProfile_600s_20180816T230000_20181119T010000.bc",
-  kernels .. "/DetailedSurvey_600s_20190108T000000_20190317T000000.bsp",
-  kernels .. "/OrbitalA_600s_20181203T230000_20190109T000000.bsp",
-  kernels .. "/OrbitalA_NominalProfile_600s_20181203T230000_20190109T000000.bc",
-  kernels .. "/OrbitalB_600s_20190316T000000_20190521T000000.bsp",
-  kernels .. "/DetailedSurvey_NominalProfile_600s_20190108T000000_20190317T000000.bc",
-  kernels .. "/OrbitalB_NominalProfile600s_20190316T000000_20190521T000000.bc",
-  kernels .. "/PrelimSurvey_600s_20181119T230000_20181204T010000.bsp",
-  kernels .. "/PrelimSurvey_NominalProfile_600s_20181119T230000_20181204T010000.bc",
-  kernels .. "/Recon_600s_20190519T000000_20190830T000000.bsp",
-  kernels .. "/Recon_NominalProfile_600s_20190519T000000_20190830T000000.bc",
-  
-  -- Nominal_Observations_Science
-  kernels .. "/Phase03_AP_DustSearch_1.bc",
-  kernels .. "/Phase03_AP_LightCurve_1.bc",
-  kernels .. "/Phase03_AP_LightCurve_2.bc",
-  kernels .. "/Phase03_AP_SatSearch_1.bc",
-  kernels .. "/Phase03_AP_SatSearch_2.bc",
-  kernels .. "/Phase03_AP_PhaseFunction_1.bc",
-  kernels .. "/Phase03_AP_ShapeModel_1.bc",
-  kernels .. "/Phase03_AP_ShapeModel_2.bc",
-  kernels .. "/Phase03_AP_ShapeModel_3.bc",
-  kernels .. "/Phase03_AP_ShapeModel_4.bc",
-  kernels .. "/Phase03_AP_ShapeModel_5.bc",
-  kernels .. "/Phase03_AP_ShapeModel_6.bc",
-  kernels .. "/Phase03_AP_ShapeModel_7.bc",
-  kernels .. "/Phase03_AP_ShapeModel_8.bc",
-  kernels .. "/Phase03_AP_ShapeModel_9_Forced4x4.bc",
-  kernels .. "/Phase03_AP_SpectraMap_1.bc",
-  kernels .. "/Phase04_PS_MC_1_v1_1a.bc",
-  kernels .. "/Phase04_PS_MC_2_v1_1a.bc",
-  kernels .. "/Phase04_PS_OLA_Nominal_1.bc",
-  kernels .. "/Phase04_PS_OLA_Nominal_2.bc",
-  kernels .. "/Phase04_PS_OLA_Nominal_3.bc",
-  kernels .. "/Phase04_PS_OLA_Nominal_4.bc",
-  kernels .. "/Phase04_PS_PolyCam_1.bc",
-  kernels .. "/Phase04_PS_PolyCam_2.bc",
-  kernels .. "/Phase04_PS_PolyCam_3.bc",
-  kernels .. "/Phase04_PS_PolyCam_4.bc",
-  kernels .. "/Phase04_PS_PolyCam_5.bc",
-  kernels .. "/Phase04_PS_PolyCam_6.bc",
-
-  --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19013_18_BBD1_info.TXT")
-  --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19014_16_BBD2_info.TXT")
-  --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19020_18_BBD3_info.TXT")
-  --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/atl_19021_19_BBD4_info.TXT")
-  --openspace.spice.loadKernel(kernels .. "/OsirisRexKernels/Nominal_Observations_Science/06_DetailedSurvey/BaseballDiamond_v2/README.txt")
-  
-  kernels .. "/atl_19013_18_BBD1_v2.bc",
-  kernels .. "/atl_19014_16_BBD2_v2.bc",
-  kernels .. "/atl_19020_18_BBD3_v2.bc",
-  kernels .. "/atl_19021_19_BBD4_v2.bc",
-  
-
-  kernels .. "/Phase06_DS_Equatorial_Stations_1.bc",
-  kernels .. "/Phase06_DS_Equatorial_Stations_2.bc",
-  kernels .. "/Phase06_DS_Equatorial_Stations_3.bc",
-  kernels .. "/Phase06_DS_Equatorial_Stations_4.bc",
-  kernels .. "/Phase06_DS_Equatorial_Stations_5.bc",
-  kernels .. "/Phase06_DS_Equatorial_Stations_6.bc",
-  kernels .. "/Phase06_DS_Equatorial_Stations_7.bc",
-  kernels .. "/Phase06_DS_Plume_Search_1.bc",
-  kernels .. "/Phase06_DS_Plume_Search_2.bc",
-  kernels .. "/Phase07_OB_CSS_Mapping_1.bc",
-  kernels .. "/Phase07_OB_CSS_Mapping_2.bc",
-  kernels .. "/Phase07_OB_CSS_Mapping_3.bc",
-  kernels .. "/CSS_Mapping_1.a",
-  kernels .. "/CSS_Mapping_2.a",
-  kernels .. "/CSS_Mapping_3.a",
-
-  --openspace.spice.loadKernel(kernels .. "/Case02_0Latitude.wmv")
-  --openspace.spice.loadKernel(kernels .. "/Case05_20negLatitude.wmv")
-  --openspace.spice.loadKernel(kernels .. "/Case08_40negLatitude.wmv")
-  --openspace.spice.loadKernel(kernels .. "/Case11_60negLatitude.wmv")
-}
 
 local LightSources = {
   {
@@ -185,11 +29,6 @@ local LightSources = {
   }
 }
 
--- Append the CaseDependentKernels at the end of the OsirisRexKernels set
-for i = 0, #CaseDependentKernels do
-  OsirisRexKernels[#OsirisRexKernels + 1] = CaseDependentKernels[i]
-end
-
 local OsirisRex = {
   Identifier = "OsirisRex",
   Parent = sunTransforms.SolarSystemBarycenter.Identifier,
@@ -204,7 +43,7 @@ local OsirisRex = {
       Type = "SpiceRotation",
       SourceFrame = "ORX_SPACECRAFT",
       DestinationFrame = "GALACTIC"
-    }
+    },
   },
   Renderable = {
     Type = "RenderableModel",
@@ -262,7 +101,7 @@ local Rexis = {
       Type = "SpiceRotation",
       SourceFrame = "ORX_REXIS",
       DestinationFrame = "ORX_SPACECRAFT"
-    }
+    },
   },
   GUI = {
     Name = "REXIS",
@@ -274,13 +113,13 @@ local PolyCamFov = {
   Identifier = "POLYCAM FOV",
   Parent = PolyCam.Identifier,
   Renderable = {
-    Type  = "RenderableFov",
-    Body  = "OSIRIS-REX",
+    Type = "RenderableFov",
+    Body = "OSIRIS-REX",
     Frame = "ORX_OCAMS_POLYCAM",
-    RGB   = { 0.8, 0.7, 0.7 },
+    RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name       = "ORX_OCAMS_POLYCAM",
-      Method     = "ELLIPSOID",
+      Name = "ORX_OCAMS_POLYCAM",
+      Method = "ELLIPSOID",
       Aberration = "NONE"
     },
     PotentialTargets = { BENNU_BODY }
@@ -295,13 +134,13 @@ local RexisFov = {
   Identifier = "REXIS FOV",
   Parent = Rexis.Identifier,
   Renderable = {
-    Type  = "RenderableFov",
-    Body  = "OSIRIS-REX",
+    Type = "RenderableFov",
+    Body = "OSIRIS-REX",
     Frame = "ORX_REXIS",
-    RGB   = { 0.8, 0.7, 0.7 },
+    RGB = { 0.8, 0.7, 0.7 },
     Instrument = {
-      Name       = "ORX_REXIS",
-      Method     = "ELLIPSOID",
+      Name = "ORX_REXIS",
+      Method = "ELLIPSOID",
       Aberration = "NONE"
     },
     PotentialTargets = { BENNU_BODY },
@@ -316,5 +155,9 @@ local RexisFov = {
 }
 
 assetHelper.registerSceneGraphNodesAndExport(asset, {
-  OsirisRex, PolyCam, Rexis, PolyCamFov, RexisFov
+  OsirisRex,
+  PolyCam,
+  Rexis,
+  PolyCamFov,
+  RexisFov
 })
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/models.asset b/data/assets/scene/solarsystem/missions/osirisrex/models.asset
new file mode 100644
index 0000000000..cdd95678ff
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/osirisrex/models.asset
@@ -0,0 +1,8 @@
+local models = asset.syncedResource({
+  Name = "Bennu Models",
+  Type = "HttpSynchronization",
+  Identifier = "bennu_models",
+  Version = 2
+})
+
+asset.export('models', models)
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset
index ff5d7658b6..8428875ce3 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset
@@ -1,4 +1,4 @@
-asset.require('./bennu')
+asset.require('./bennu_projection')
 asset.require('./model')
 asset.require('./trail')
 asset.require('scene/solarsystem/sun/marker')
diff --git a/data/assets/scene/solarsystem/missions/perseverance/model.asset b/data/assets/scene/solarsystem/missions/perseverance/model.asset
index f11c247d21..cbe8099d9f 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/model.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/model.asset
@@ -1,6 +1,6 @@
 --perseverance/model.asset
 local assetHelper = asset.require('util/asset_helper')
-local transforms = asset.require('./transforms')
+local trail = asset.require('./trail')
 local marsTransforms = asset.require('scene/solarsystem/planets/mars/transforms')
 local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
 -- asset.require('./fov')
@@ -29,7 +29,7 @@ local models = asset.syncedResource({
 -- Perseverance Model --
 local Perseverance = {
   Identifier = "Perseverance",
-  Parent = transforms.MSL_Body.Identifier,
+  Parent = trail.PerseveranceNode.Identifier,
   GUI = {
     Name = "Perseverance",
     Path = "/Solar System/Missions/Perseverance"
@@ -56,7 +56,8 @@ local Body = {
     Body = "MARS SCIENCE LABORATORY",
     GeometryFile = models .. "/Perseverance.obj",
     LightSources = LightSources,
-    PerformShading = false
+    PerformShading = false,
+    RotationVector = {65.940000,201.389999,263.980011}
   },
   GUI = {
     Name = "Perseverance Model Body",
diff --git a/data/assets/scene/solarsystem/missions/perseverance/trail.asset b/data/assets/scene/solarsystem/missions/perseverance/trail.asset
index 79ccffb602..10c76a45eb 100644
--- a/data/assets/scene/solarsystem/missions/perseverance/trail.asset
+++ b/data/assets/scene/solarsystem/missions/perseverance/trail.asset
@@ -60,10 +60,11 @@ local PerseveranceTrailSun = {
     Color = { 0.2, 0.7, 0.1 },
     StartTime = startTime,
     EndTime = endTime,
-    SampleInterval = 100
+    SampleInterval = 100,
+    Enabled = false
   },
   GUI = {
-    Name = "Perseverance Trail",
+    Name = "Perseverance Trail (Sun)",
     Path = "/Solar System/Missions/Perseverance"
   }
 }
@@ -82,7 +83,8 @@ local PerseveranceTrailMars = {
     Color = { 0.7, 0.9, 0.6 },
     StartTime = approachMars,
     EndTime = endTime,
-    SampleInterval = 100
+    SampleInterval = 100,
+    Enabled = false
   },
   GUI = {
     Name = "Perseverance Trail (Mars)",
diff --git a/data/assets/scene/solarsystem/missions/perseverance/transforms.asset b/data/assets/scene/solarsystem/missions/perseverance/transforms.asset
deleted file mode 100644
index c4caed35ac..0000000000
--- a/data/assets/scene/solarsystem/missions/perseverance/transforms.asset
+++ /dev/null
@@ -1,503 +0,0 @@
-local assetHelper = asset.require('util/asset_helper')
-local marsTransforms = asset.require('scene/solarsystem/planets/mars/transforms')
-local marsAsset = asset.require('scene/solarsystem/planets/mars/mars')
-local trailAsset = asset.require('./trail')
-
-
-local MSL_Body = {
-  Identifier = "MSL_Body",
-  Parent =  trailAsset.PerseveranceNode.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0, 0.0, 2.8 }
-    },
-    Rotation = {
-      Type = "StaticRotation",
-      Rotation = { -0.521593,0.648407,2.888407 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
----- ROBOTIC ARM RA ----
-local RA_Base_Location = {
-  Identifier = "RA_Base_Location",
-  Parent = MSL_Body.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 1.111, -0.4525, -0.106 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
---AZ
-local RA_Shoulder_AZ_Location = {
-  Identifier = "RA_Shoulder_AZ_Location",
-  Parent = RA_Base_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, 0.0, -0.08 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-----EL
-local RA_Shoulder_EL_Location = {
-  Identifier = "RA_Shoulder_EL_Location",
-  Parent = RA_Shoulder_AZ_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.17, 0.2, -0.005 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
---ELBOW
-local RA_Elbow_Location = {
-  Identifier = "RA_Elbow_Location",
-  Parent = RA_Shoulder_EL_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.83, -0.2, 0.0 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
---WRIST
-local RA_Wrist_Location = {
-  Identifier = "RA_Wrist_Location",
-  Parent = RA_Elbow_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.77, 0.13, 0.035 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
---TURRET
-local RA_Turret_Location = {
-  Identifier = "RA_Turret_Location",
-  Parent = RA_Wrist_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, 0.04, -0.15 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
---MAHLI
-local RA_Mahli_Location = {
-  Identifier = "RA_Mahli_Location",
-  Parent = RA_Turret_Location.Identifier
-}
-
----- MASTCAM RSM ----
-local RSM_ROOT_Location = {
-  Identifier = "RSM_ROOT_Location",
-  Parent = MSL_Body.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.7039, 0.5769, -0.563 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local RSM_AZ_Location = {
-  Identifier = "RSM_AZ_Location",
-  Parent = RSM_ROOT_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, 0.008, 0.0 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local RSM_ZERO_EL_Location = {
-  Identifier = "RSM_ZERO_EL_Location",
-  Parent = RSM_AZ_Location.Identifier,
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local RSM_EL_Location = {
-  Identifier = "RSM_EL_Location",
-  Parent = RSM_AZ_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      --Position = {0.0, 0.0, -0.664}
-      Position = { 0.002, 0.007, -0.688 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
----- HIGH GAIN ANTENNA HGA ----
-local HGA_AZ_Location = {
-  Identifier = "HGA_AZ_Location",
-  Parent = MSL_Body.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { -0.46, -0.47, -0.55 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local HGA_EL_Location = {
-  Identifier = "HGA_EL_Location",
-  Parent = HGA_AZ_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, 0.0, -0.17 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
----- SAM & HEMIN ----
-local SAM_Cover_1_Location = {
-  Identifier = "SAM_Cover_1_Location",
-  Parent = MSL_Body.Identifier,
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local SAM_Cover_2_Location = {
-  Identifier = "SAM_Cover_2_Location",
-  Parent = MSL_Body.Identifier,
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local CHEMIN_Location = {
-  Identifier = "CHEMIN_Location",
-  Parent = MSL_Body.Identifier,
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
----- Wheels ----
-local Wheel_base_Location = {
-  Identifier = "Wheel_base_Location",
-  Parent = MSL_Body.Identifier,
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
--- Left side --
-local Leg_1_L_Location = {
-  Identifier = "Leg_1_L_Location",
-  Parent = Wheel_base_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.217, -0.812, -0.215 }   --for the right side
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Leg_2_L_Location = {
-  Identifier = "Leg_2_L_Location",
-  Parent = Leg_1_L_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { -0.74, -0.00380, 0.223 } --CORRECT, DONT CHANGE
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Wrist_F_L_Location = {
-  Identifier = "Wrist_F_L_Location",
-  Parent = Leg_1_L_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.8839, -0.2659, 0.2 } --CORRECT, DONT TOUCH
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Wheel_F_L_Location = {
-  Identifier = "Wheel_F_L_Location",
-  Parent = Wrist_F_L_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, 0.0, 0.426 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Wheel_C_L_Location = {
-  Identifier = "Wheel_C_L_Location",
-  Parent = Leg_2_L_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.45, -0.4, 0.403 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Wrist_B_L_Location = {
-  Identifier = "Wrist_B_L_Location",
-  Parent = Leg_2_L_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { -0.627, -0.2635, -0.022 } --CORRECT, DONT CHANGE
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Wheel_B_L_Location = {
-  Identifier = "Wheel_B_L_Location",
-  Parent = Wrist_B_L_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, -0.0, 0.426 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
--- wheels, Right Side --
-local Leg_1_R_Location = {
-  Identifier = "Leg_1_R_Location",
-  Parent = Wheel_base_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.217, 0.812, -0.215 }   --Check with caroline!!!
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Leg_2_R_Location = {
-  Identifier = "Leg_2_R_Location",
-  Parent = Leg_1_R_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      --Position = {-0.74, 0.0, 0.24}
-      Position = { -0.74, 0.00380, 0.223 } --want to use this one, once the center point is changed in maya
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Wrist_F_R_Location = {
-  Identifier = "Wrist_F_R_Location",
-  Parent = Leg_1_R_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.882, 0.259, 0.215 }
-      --Position = {0.8839, 0.2659, 0.2} --position for the Wrist_F_L
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Wheel_F_R_Location = {
-  Identifier = "Wheel_F_R_Location",
-  Parent = Wrist_F_R_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, 0.0, 0.426 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Wheel_C_R_Location = {
-  Identifier = "Wheel_C_R_Location",
-  Parent = Leg_2_R_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.45, 0.4, 0.403 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Wrist_B_R_Location = {
-  Identifier = "Wrist_B_R_Location",
-  Parent = Leg_2_R_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { -0.6208, 0.2759, -0.025 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-local Wheel_B_R_Location = {
-  Identifier = "Wheel_B_R_Location",
-  Parent = Wrist_B_R_Location.Identifier,
-  Transform = {
-    Translation = {
-      Type = "StaticTranslation",
-      Position = { 0.0, -0.0005, 0.426 }
-    }
-  },
-  GUI = {
-    Path = "/Solar System/Missions/Perseverance/Transforms",
-    Hidden = true
-  }
-}
-
-assetHelper.registerSceneGraphNodesAndExport(asset, { 
-  MSL_Body,
-  RA_Base_Location,
-  RA_Shoulder_AZ_Location,
-  RA_Shoulder_EL_Location,
-  RA_Elbow_Location,
-  RA_Wrist_Location,
-  RA_Turret_Location,
-  RA_Mahli_Location,
-  RSM_ROOT_Location,
-  RSM_AZ_Location,
-  RSM_ZERO_EL_Location,
-  RSM_EL_Location,
-
-  HGA_AZ_Location,
-  HGA_EL_Location,
-  SAM_Cover_1_Location,
-  SAM_Cover_2_Location,
-  CHEMIN_Location,
-
-  Wheel_base_Location,
-  Leg_1_L_Location,
-  Leg_2_L_Location,
-  Wrist_F_L_Location,
-  Wheel_F_L_Location,
-  Wheel_C_L_Location,
-  Wrist_B_L_Location,
-  Wheel_B_L_Location,
-
-  Leg_1_R_Location,
-  Leg_2_R_Location,
-  Wrist_F_R_Location,
-  Wheel_F_R_Location,
-  Wheel_C_R_Location,
-  Wrist_B_R_Location,
-  Wheel_B_R_Location
-})
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index 922dfa6c03..85d6b3bf30 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -83,7 +83,7 @@ local Voyager1Main = {
 }
 
 local Voyager1Antenna = {
-  Identifier = "Voyager_1_Antanna",
+  Identifier = "Voyager_1_Antenna",
   Parent = Voyager1.Identifier,
   Renderable = {
     Type = "RenderableModel",
@@ -92,7 +92,7 @@ local Voyager1Antenna = {
     LightSources = LightSources
   },
   GUI = {
-    Name = "Voyager 1 Antanna",
+    Name = "Voyager 1 Antenna",
     Path = "/Solar System/Missions/Voyager 1"
   }
 }
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index 8cbe9dcbac..812c3d29a2 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -87,7 +87,7 @@ local Voyager2Main = {
 }
 
 local Voyager2Antenna = {
-  Identifier = "Voyager_2_Antanna",
+  Identifier = "Voyager_2_Antenna",
   Parent = Voyager2.Identifier,
   Renderable = {
     Type = "RenderableModel",
@@ -96,7 +96,7 @@ local Voyager2Antenna = {
     LightSources = LightSources
   },
   GUI = {
-    Name = "Voyager 2 Antanna",
+    Name = "Voyager 2 Antenna",
     Path = "/Solar System/Missions/Voyager 2"
   }
 }
@@ -116,7 +116,7 @@ local VoyagerTrailCruiseEarthJupiter = {
       Kernels = Kernels
     },
     Color = { 0.70, 0.50, 0.20 },
-    StartTime = "1977 SEP 05",
+    StartTime = "1977-AUG-20 16:07:06.535",
     EndTime = "1979 JUL 06",
     SampleInterval = 669 * 2  -- 669 is the number of days between the Start and End time
   },
diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset
index fb34cd82d1..ef29f8c1f3 100644
--- a/data/assets/scene/solarsystem/planets/earth/earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/earth.asset
@@ -23,21 +23,16 @@ local Earth = {
       }
     },
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/Earth.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 40.0,
-      LabelsSize = 4.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 300000.0,
-      FadeOutStartingDistance = 10000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 1500000.0,
-      LabelsColor = { 1.0, 0.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 5.0,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 10000.0, 300000.0 },
+      DistanceEPS = 1500000.0,
+      Color = { 1.0, 0.0, 0.0 }
     }
   },
   Tag = { "planet_solarSystem", "planet_terrestrial" },
@@ -54,20 +49,16 @@ local EarthLabel = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "Earth",
-    FontSize = 100.0,
-    LabelSize = 8.6,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Text = "Earth",
+    FontSize = 70.0,
+    Size = 8.77,
+    MinMaxSize = { 1, 100 },
+    OrientationOption = "Camera View Direction",
     BlendMode = "Additive",
     EnableFading = true,
-    FadeStartUnit = "au",
-    FadeStartDistance = 1.5,
-    FadeStartSpeed = 1.0,
-    FadeEndUnit = "au",
-    FadeEndDistance = 15.0,
-    FadeEndSpeed = 25.0
+    FadeUnit = "au",
+    FadeDistances = { 1.5, 15.0 },
+    FadeWidths = { 1.0, 25.0 }
   },
   Tag = { "solarsystem_labels" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset
new file mode 100644
index 0000000000..420ff19185
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset
@@ -0,0 +1,59 @@
+local assetHelper = asset.require('util/asset_helper')
+local transforms = asset.require('scene/solarsystem/sun/transforms')
+local circle = asset.require('util/circle').circle
+local kernels = asset.require('scene/solarsystem/planets/earth/lagrange_points/lagrange_kernels').kernels
+asset.require('spice/base')
+
+local L1 = {
+  Identifier = "L1",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderablePlaneImageLocal",
+    RenderableType = "Opaque",
+    Billboard = true,
+    Size = 700E5,
+    Texture = circle .. "/circle.png",
+    BlendMode = "Additive"
+  },
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "391", -- L1
+      Observer = "SUN",
+      Kernels = kernels .. "/L1_de431.bsp"
+    }
+  },
+  Tag = { "lagrange_points_earth" , "lagrange_points_earth_l1" },
+  GUI = {
+    Name = "L1",
+    Path = "/Solar System/Planets/Earth/Lagrange points",
+  }
+}
+
+local L1Label = {
+  Identifier = "L1Label",
+  Parent = L1.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderableLabels",
+    Text = "L1",
+    FontSize = 20,
+    Size = 7.5,
+    MinMaxSize = { 1.0, 100.0},
+    OrientationOption = "Camera View Direction",
+    BlendMode = "Normal",
+    EnableFading = false
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l1" },
+  GUI = {
+    Name = "L1 Label",
+    Path = "/Solar System/Planets/Earth/Lagrange points",
+    Description = "Main label for L1"
+  }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, {
+  L1,
+  L1Label
+})
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset
new file mode 100644
index 0000000000..0f84519837
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset
@@ -0,0 +1,127 @@
+local assetHelper = asset.require('util/asset_helper')
+local transforms = asset.require('scene/solarsystem/sun/transforms')
+local circle = asset.require('util/circle').circle
+local kernels = asset.require('scene/solarsystem/planets/earth/lagrange_points/lagrange_kernels').kernels
+asset.require('spice/base')
+
+local L2Small = {
+  Identifier = "L2Small",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Type = "RenderablePlaneImageLocal",
+    RenderableType = "Opaque",
+    Billboard = true,
+    Size = 400E4,
+    Texture = circle .. "/circle.png",
+    BlendMode = "Additive"
+  },
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "392", -- L2
+      Observer = "SUN",
+      Kernels = kernels .. "/L2_de431.bsp"
+    }
+  },
+  Tag = { "lagrange_points_earth_l2_small" },
+  GUI = {
+    Name = "Small L2",
+    Path = "/Solar System/Planets/Earth/Lagrange points",
+  }
+}
+
+local L2 = {
+  Identifier = "L2",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderablePlaneImageLocal",
+    RenderableType = "Opaque",
+    Billboard = true,
+    Size = 700E5,
+    Texture = circle .. "/circle.png",
+    BlendMode = "Additive"
+  },
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "392", -- L2
+      Observer = "SUN",
+      Kernels = kernels .. "/L2_de431.bsp"
+    }
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
+  GUI = {
+    Name = "L2",
+    Path = "/Solar System/Planets/Earth/Lagrange points",
+  }
+}
+
+local L2SmallLabel = {
+  Identifier = "L2SmallLabel",
+  Parent = L2.Identifier,
+  Renderable = {
+    Enabled = true,
+    Type = "RenderableLabels",
+    Text = "L2",
+    FontSize = 20.0,
+    Size = 6.0,
+    MinMaxSize = { 1.0, 100.0 },
+    OrientationOption = "Camera View Direction",
+    BlendMode = "Normal",
+    EnableFading = false
+  },
+  Tag = { "lagrange_points_earth_l2_small" },
+  GUI = {
+    Name = "Small L2 Label",
+    Path = "/Solar System/Planets/Earth/Lagrange points",
+    Description = "Small label for L2"
+  }
+}
+
+local L2Label = {
+  Identifier = "L2Label",
+  Parent = L2.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderableLabels",
+    Text = "L2",
+    FontSize = 20,
+    Size = 7.5,
+    MinMaxSize = { 1.0, 100.0},
+    OrientationOption = "Camera View Direction",
+    BlendMode = "Normal",
+    EnableFading = false
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l2" },
+  GUI = {
+    Name = "L2 Label",
+    Path = "/Solar System/Planets/Earth/Lagrange points",
+    Description = "Main label for L2"
+  }
+}
+
+local L2SunLine = {
+  Identifier = "L2SunLine",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Type = "RenderableNodeLine",
+    StartNode = "Sun",
+    EndNode = "L2Small",
+    Color = { 0.5, 0.5, 0.5 },
+    LineWidth = 2
+  },
+  Tag = { "lagrange_points_earth_l2_small" },
+  GUI = {
+    Name = "Sun to L2 Line",
+    Path = "/Solar System/Planets/Earth/Lagrange points",
+  }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, {
+  L2Small,
+  L2,
+  L2SunLine,
+  L2SmallLabel,
+  L2Label
+})
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset
new file mode 100644
index 0000000000..05ca2a57b5
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset
@@ -0,0 +1,59 @@
+local assetHelper = asset.require('util/asset_helper')
+local transforms = asset.require('scene/solarsystem/sun/transforms')
+local circle = asset.require('util/circle').circle
+local kernels = asset.require('scene/solarsystem/planets/earth/lagrange_points/lagrange_kernels').kernels
+asset.require('spice/base')
+
+local L4 = {
+  Identifier = "L4",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderablePlaneImageLocal",
+    RenderableType = "Opaque",
+    Billboard = true,
+    Size = 800E6,
+    Texture = circle .. "/circle.png",
+    BlendMode = "Additive"
+  },
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "394", -- L4
+      Observer = "SUN",
+      Kernels = kernels .. "/L4_de431.bsp"
+    }
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l4" },
+  GUI = {
+    Name = "L4",
+    Path = "/Solar System/Planets/Earth/Lagrange points",
+  }
+}
+
+local L4Label = {
+  Identifier = "L4Label",
+  Parent = L4.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderableLabels",
+    Text = "L4",
+    FontSize = 20,
+    Size = 8.5,
+    MinMaxSize = { 1.0, 100.0 },
+    OrientationOption = "Camera View Direction",
+    BlendMode = "Normal",
+    EnableFading = false
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l4" },
+  GUI = {
+    Name = "L4 Label",
+    Path = "/Solar System/Planets/Earth/Lagrange points",
+    Description = "Main label for L4"
+  }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, {
+  L4,
+  L4Label
+})
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset
new file mode 100644
index 0000000000..dcaabb12b7
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset
@@ -0,0 +1,59 @@
+local assetHelper = asset.require('util/asset_helper')
+local transforms = asset.require('scene/solarsystem/sun/transforms')
+local circle = asset.require('util/circle').circle
+local kernels = asset.require('scene/solarsystem/planets/earth/lagrange_points/lagrange_kernels').kernels
+asset.require('spice/base')
+
+local L5 = {
+  Identifier = "L5",
+  Parent = transforms.SolarSystemBarycenter.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderablePlaneImageLocal",
+    RenderableType = "Opaque",
+    Billboard = true,
+    Size = 800E6,
+    Texture = circle .. "/circle.png",
+    BlendMode = "Additive"
+  },
+  Transform = {
+    Translation = {
+      Type = "SpiceTranslation",
+      Target = "395", -- L5
+      Observer = "SUN",
+      Kernels = kernels .. "/L5_de431.bsp"
+    }
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l5" },
+  GUI = {
+    Name = "L5",
+    Path = "/Solar System/Planets/Earth/Lagrange points",
+  }
+}
+
+local L5Label = {
+  Identifier = "L5Label",
+  Parent = L5.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderableLabels",
+    Text = "L5",
+    FontSize = 20,
+    Size = 8.5,
+    MinMaxSize = { 1.0, 100.0 },
+    OrientationOption = "Camera View Direction",
+    BlendMode = "Normal",
+    EnableFading = false
+  },
+  Tag = { "lagrange_points_earth", "lagrange_points_earth_l5" },
+  GUI = {
+    Name = "L5 Label",
+    Path = "/Solar System/Planets/Earth/Lagrange points",
+    Description = "Main label for L5"
+  }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, {
+  L5,
+  L5Label
+})
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_kernels.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_kernels.asset
new file mode 100644
index 0000000000..b78370a3a8
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_kernels.asset
@@ -0,0 +1,8 @@
+local kernels = asset.syncedResource({
+  Name = "Lagrange Kernels",
+  Type = "HttpSynchronization",
+  Identifier = "earth_lagrange_kernels",
+  Version = 1
+})
+
+asset.export('kernels', kernels)
diff --git a/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset
new file mode 100644
index 0000000000..8c4d507ca0
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/lagrange_points/lagrange_points.asset
@@ -0,0 +1,4 @@
+asset.require('scene/solarsystem/planets/earth/lagrange_points/L1')
+asset.require('scene/solarsystem/planets/earth/lagrange_points/L2')
+asset.require('scene/solarsystem/planets/earth/lagrange_points/L4')
+asset.require('scene/solarsystem/planets/earth/lagrange_points/L5')
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
index f24995d8bd..f3cd2cea9a 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
@@ -34,21 +34,16 @@ local Moon = {
       }
     },        
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/moon.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 14.0,
-      LabelsSize = 8.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 500000.0,
-      FadeOutStartingDistance = 100000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 1350000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 7.6,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 100000.0, 500000.0 },
+      DistanceEPS = 1350000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
index 54defe6c21..3c12782da0 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -46,12 +46,12 @@ local initializeAndAddNodes = function()
   }
 
   local parentNode = {
-     Identifier = "ISSparentNode",
+     Identifier = "ISSModel",
       Parent = iss.Identifier,
       Transform = {
         Rotation = {
           Type = "FixedRotation",
-          Attached = "ISSparentNode",
+          Attached = "ISSModel",
           XAxis = { 0.01, -1.0, 0.56 },
           XAxisOrthogonal = true,
           YAxis = transforms.EarthInertial.Identifier
@@ -73,9 +73,8 @@ local initializeAndAddNodes = function()
         DisableFaceCulling = true
       },
       GUI = {
-        Name = "ISSparentNode",
-        Path = "/Solar System/Planets/Earth/Satellites/ISS",
-        Hidden = true,
+        Name = "ISS Model",
+        Path = "/Solar System/Planets/Earth/Satellites/ISS"
       }
   }
 
@@ -104,34 +103,29 @@ local initializeAndAddNodes = function()
     }
   }
 
+  -- @TODO (emmbr, 2021-05-27) add to scene when label rendering issues have been fixed
   local IssLabel = {
     Identifier = "IssLabel",
     Parent = iss.Identifier,
-
     Renderable = {
       Enabled = false,
       Type = "RenderableLabels",
-      LabelText = "ISS",
-      FontSize = 100.0,
-      LabelSize = 3.4,
-      LabelMaxSize = 100.0,
-      LabelMinSize = 1.0,
-      LabelOrientationOption = "Camera View Direction",
+      Text = "ISS",
+      FontSize = 70.0,
+      Size = 3.4,
+      MinMaxSize = { 1, 100 },
+      OrientationOption = "Camera View Direction",
       BlendMode = "Additive",
       EnableFading = true,
-      FadeStartUnit = "au",
-      FadeStartDistance = 0.15,
-      FadeStartSpeed = 1.0,
-      FadeEndUnit = "au",
-      FadeEndDistance = 15.0,
-      FadeEndSpeed = 25.0
+      FadeDistances = { 0.15, 15.0 },
+      FadeWidths = { 1.0, 25.0 }
     },
     Tag = { "solarsystem_labels" },
     GUI = {
       Name = "ISS Label",
       Path = "/Solar System/Planets/Earth/Satellites"
     }
-}
+  }
 
   return { iss, parentNode, issTrail }
 end
@@ -141,7 +135,7 @@ asset.onInitialize(function ()
   for _, node in ipairs(nodes) do
     openspace.addSceneGraphNode(node)
   end
-  openspace.setPropertyValueSingle("Scene.ISSparentNode.Rotation.yAxis-InvertObject", true)
+  openspace.setPropertyValueSingle("Scene.ISSModel.Rotation.yAxisInvertObject", true)
 
 end)
 
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 96c6e5561b..0713514a18 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
@@ -59,38 +59,35 @@ asset.onInitialize(function ()
     },
     Tag = { "earth_satellite", "Aqua" },
     GUI = {
-      Name = "Terra Trail",
+      Name = "Aqua Trail",
       Path = "/Solar System/Planets/Earth/Satellites/Aqua"
     }
   }
 
+  -- @TODO (emmbr, 2021-05-27) this label is not visible. Too large fade distances?
+  -- Might also be affected by the rendering issues for labels
   local AquaLabel = {
-      Identifier = "AquaLabel",
-      Parent = Aqua.Identifier,
-
-      Renderable = {
-        Enabled = false,
-        Type = "RenderableLabels",
-        LabelText = "SNPP",
-        FontSize = 100.0,
-        LabelSize = 4.0,
-        LabelMaxSize = 100.0,
-        LabelMinSize = 1.0,
-        LabelOrientationOption = "Camera View Direction",
-        BlendMode = "Additive",
-        EnableFading = true,
-        FadeStartUnit = "au",
-        FadeStartDistance = 0.15,
-        FadeStartSpeed = 1.0,
-        FadeEndUnit = "au",
-        FadeEndDistance = 15.0,
-        FadeEndSpeed = 25.0
-      },
-      Tag = { "solarsystem_labels" },
-      GUI = {
-          Name = "Aqua Label",
-          Path = "/Solar System/Planets/Earth"
-      }
+    Identifier = "AquaLabel",
+    Parent = Aqua.Identifier,
+    Renderable = {
+      Enabled = false,
+      Type = "RenderableLabels",
+      Text = "Aqua",
+      FontSize = 70.0,
+      Size = 4.0,
+      MinMaxSize = { 1, 100 },
+      OrientationOption = "Camera View Direction",
+      BlendMode = "Additive",
+      EnableFading = true,
+      FadeUnit = "au",
+      FadeDistances = { 1.5, 15.0 },
+      FadeWidths = { 1.0, 25.0 }
+    },
+    Tag = { "solarsystem_labels" },
+    GUI = {
+      Name = "Aqua Label",
+      Path = "/Solar System/Planets/Earth"
+    }
   }
 
   table.insert(nodes, Aqua)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
index 9564cd31d6..56a3146324 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
@@ -67,32 +67,28 @@ asset.onInitialize(function ()
   }
 
   local SNPPLabel = {
-      Identifier = "SNPPLabel",
-      Parent = SNPP.Identifier,
+    Identifier = "SNPPLabel",
+    Parent = SNPP.Identifier,
 
-      Renderable = {
-        Enabled = false,
-        Type = "RenderableLabels",
-        LabelText = "SNPP",
-        FontSize = 100.0,
-        LabelSize = 4.0,
-        LabelMaxSize = 100.0,
-        LabelMinSize = 1.0,
-        LabelOrientationOption = "Camera View Direction",
-        BlendMode = "Additive",
-        EnableFading = true,
-        FadeStartUnit = "au",
-        FadeStartDistance = 0.15,
-        FadeStartSpeed = 1.0,
-        FadeEndUnit = "au",
-        FadeEndDistance = 15.0,
-        FadeEndSpeed = 25.0
-      },
-      Tag = { "solarsystem_labels" },
-      GUI = {
-        Name = "SNPP Label",
-        Path = "/Solar System/Planets/Earth"
-      }
+    Renderable = {
+      Enabled = false,
+      Type = "RenderableLabels",
+      Text = "SNPP",
+      FontSize = 70.0,
+      Size = 4.0,
+      MinMaxSize = { 1, 100 },
+      OrientationOption = "Camera View Direction",
+      BlendMode = "Additive",
+      EnableFading = true,
+      FadeUnit = "au",
+      FadeDistances = { 1.5, 15.0 },
+      FadeWidths = { 1.0, 25.0 }
+    },
+    Tag = { "solarsystem_labels" },
+    GUI = {
+      Name = "SNPP Label",
+      Path = "/Solar System/Planets/Earth"
+    }
   }
 
   table.insert(nodes, SNPP)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
index 9065e44536..49c0fc93d1 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
@@ -66,33 +66,30 @@ asset.onInitialize(function ()
     }
   }
 
+  -- @TODO (emmbr, 2021-05-27) this label is not visible. Too large fade distances?
+  -- Might also be affected by the rendering issues for labels
   local TerraLabel = {
-      Identifier = "TerraLabel",
-      Parent = Terra.Identifier,
-
-      Renderable = {
-        Enabled = false,
-        Type = "RenderableLabels",
-        LabelText = "SNPP",
-        FontSize = 100.0,
-        LabelSize = 4.0,
-        LabelMaxSize = 100.0,
-        LabelMinSize = 1.0,
-        LabelOrientationOption = "Camera View Direction",
-        BlendMode = "Additive",
-        EnableFading = true,
-        FadeStartUnit = "au",
-        FadeStartDistance = 0.15,
-        FadeStartSpeed = 1.0,
-        FadeEndUnit = "au",
-        FadeEndDistance = 15.0,
-        FadeEndSpeed = 25.0
-      },
-      Tag = { "solarsystem_labels" },
-      GUI = {
-        Name = "Terra Label",
-        Path = "/Solar System/Planets/Earth"
-      }
+    Identifier = "TerraLabel",
+    Parent = Terra.Identifier,
+    Renderable = {
+      Enabled = false,
+      Type = "RenderableLabels",
+      Text = "Terra",
+      FontSize = 70.0,
+      Size = 4.0,
+      MinMaxSize = { 1, 100 },
+      OrientationOption = "Camera View Direction",
+      BlendMode = "Additive",
+      EnableFading = true,
+      FadeUnit = "au",
+      FadeDistances = { 1.5, 15.0 },
+      FadeWidths = { 1.0, 25.0 }
+    },
+    Tag = { "solarsystem_labels" },
+    GUI = {
+      Name = "Terra Label",
+      Path = "/Solar System/Planets/Earth"
+    }
   }
 
   table.insert(nodes, Terra)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
index f62b20513d..c4503abea0 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
@@ -28,21 +28,17 @@ local Callisto = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/callisto.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 40.0,
-      LabelsSize = 10.5,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 15000000.0,
-      FadeOutStartingDistance = 5000000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 1350000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 11.5,
+      MinMaxSize = { 1, 100 },
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 5000000.0, 15000000.0 },
+      DistanceEPS = 1350000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset
index 80621e6bee..c6cc74bb68 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset
@@ -2,6 +2,6 @@ local TexturesPath = asset.syncedResource({
   Name = "Callisto Textures",
   Type = "HttpSynchronization",
   Identifier = "callisto_textures",
-  Version = 1
+  Version = 2
 })
 asset.export("TexturesPath", TexturesPath)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
index 9cd2d1cf52..21653cde87 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
@@ -3,7 +3,7 @@ local globeIdentifier = asset.require("./../../callisto").Callisto.Identifier
 
 local layer = {
   Identifier = "Texture",
-  FilePath = texturesPath .. "/callisto.jpg",
+  FilePath = texturesPath .. "/callisto_os.tif",
 }
 
 asset.onInitialize(function () 
@@ -15,8 +15,8 @@ asset.export("layer", layer)
 
 asset.meta = {
   Name = "Callisto Texutre",
-  Version = "1.0",
-  Description = [[ Default jpg texture for Callisto]],
+  Version = "2.0",
+  Description = [[ Default texture for Callisto]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license",
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
index 926c4cc1fa..efb6a7510b 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
@@ -1,7 +1,7 @@
 local colorLayersPath = "./layers/colorlayers"
 
 asset.require(colorLayersPath .. "/europa_texture")
-local colorLayer = asset.require(colorLayersPath .. "/voyager_global_mosaic")
+local colorLayer = asset.require(colorLayersPath .. "/voyager_global_mosaic_local")
 
 -- Set enabled layers (temporary solution)
 -- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
index 670ee9c7c8..1ecfb93b34 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
@@ -28,21 +28,16 @@ local Europa = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/europa.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 40.0,
-      LabelsSize = 10.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 8000000.0,
-      FadeOutStartingDistance = 5000000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 700000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 11.0,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 500000.0, 8000000.0 },
+      DistanceEPS = 700000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset
index a1eb48b59e..259bec7da5 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset
@@ -2,6 +2,6 @@ local TexturesPath = asset.syncedResource({
   Name = "Europa Textures",
   Type = "HttpSynchronization",
   Identifier = "europa_textures",
-  Version = 1
+  Version = 2
 })
 asset.export("TexturesPath", TexturesPath)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
index ed5e691509..1e690211b2 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
@@ -3,7 +3,8 @@ local globeIdentifier = asset.require("./../../europa").Europa.Identifier
 
 local layer = {
   Identifier = "Texture",
-  FilePath = texturesPath .. "/europa.jpg",
+  FilePath = texturesPath .. "/europa_os.tif",
+  Enabled = true
 }
 
 asset.onInitialize(function () 
@@ -15,8 +16,8 @@ asset.export("layer", layer)
 
 asset.meta = {
   Name = "Europa Texutre",
-  Version = "1.0",
-  Description = [[ Default jpg texture for Europa]],
+  Version = "2.0",
+  Description = [[ Default texture for Europa]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
new file mode 100644
index 0000000000..36e08d3c16
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
@@ -0,0 +1,36 @@
+local texturesPath = asset.require("./../../europa_textures").TexturesPath
+local globeIdentifier = asset.require("./../../europa").Europa.Identifier
+
+local layer = {
+  Identifier = "Voyager_Global_Mosaic_Local",
+  Name = "Voyager Global Mosaic [Local]",
+  FilePath = texturesPath .. "/evgos.vrt",
+  BlendMode = "Color"
+}
+
+asset.onInitialize(function () 
+  openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+asset.export("layer", layer)
+
+
+asset.meta = {
+  Name = "Voyager Global Mosaic",
+  Version = "1.0",
+  Description = [[ Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map
+    base of Europa utilizes the best image quality and moderate resolution coverage
+    supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2.
+    The image data was selected on the basis of overall image quality, reasonable
+    input resolution (from 20 km/pixel for gap fill to as high as 200 meters per
+    pixel[m]), and availability of moderate viewing and sun angles for topography.
+    The map projections are based on a sphere having a radius of 1,562.09 kilometers.
+    A Simple Cylindrical projection was used at a resolution of 500 m. (Description
+    from URL)]],
+  Author = "USGS",
+  URL = "https://astrogeology.usgs.gov/search/map/Europa/Voyager-Galileo/" ..
+    "Europa_Voyager_GalileoSSI_global_mosaic_500m",
+  License = "NASA/PDS",
+  Identifiers = {"Voyager_Global_Mosaic_Local"}
+}
+
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
index 182b8751e9..ccda9c129a 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
@@ -28,21 +28,16 @@ local Ganymede = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/ganymede.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 40.0,
-      LabelsSize = 10.5,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 8000000.0,
-      FadeOutStartingDistance = 2250000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 1750000.0,
-      LabelsColor = {1.0, 1.0, 0.0}
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 11.5,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 2250000.0, 8000000.0 },
+      DistanceEPS = 1750000.0,
+      Color = {1.0, 1.0, 0.0}
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
index 50e84eaa6a..641cf411f6 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
@@ -28,21 +28,16 @@ local Io = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/io.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 40.0,
-      LabelsSize = 10.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 8500000.0,
-      FadeOutStartingDistance = 4000000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 1000000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 11.0,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 4000000.0, 8500000.0 },
+      DistanceEPS = 1000000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
index c24a8d9789..29a7d0495e 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
@@ -42,12 +42,11 @@ local JupiterLabel = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "Jupiter",
-    FontSize = 100.0,
-    LabelSize = 8.6,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Text = "Jupiter",
+    FontSize = 70.0,
+    Size = 8.77,
+    MinMaxSize = { 1, 100 },
+    OrientationOption = "Camera View Direction",
     BlendMode = "Additive"
   },
   Tag = { "solarsystem_labels" },
diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset
index c82f34e5a6..c310a1906b 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset
@@ -2,6 +2,6 @@ local TexturesPath = asset.syncedResource({
   Name = "Jupiter Textures",
   Type = "HttpSynchronization",
   Identifier = "jupiter_textures",
-  Version = 1
+  Version = 2
 })
 asset.export("TexturesPath", TexturesPath)
diff --git a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
index 0a9de27073..98b2d1543d 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
@@ -3,7 +3,7 @@ local globeIdentifier = asset.require("./../../jupiter").Jupiter.Identifier
 
 local layer = {
   Identifier = "Texture",
-  FilePath = texturesPath .. "/jupiter.jpg",
+  FilePath = texturesPath .. "/jupiter_os.tif",
 }
 
 asset.onInitialize(function () 
@@ -15,8 +15,8 @@ asset.export("layer", layer)
 
 asset.meta = {
   Name = "Jupiter Texutre",
-  Version = "1.0",
-  Description = [[ Default jpg texture for Jupiter]],
+  Version = "2.0",
+  Description = [[ Default texture for Jupiter]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
   License = "MIT license"
diff --git a/data/assets/scene/solarsystem/planets/mars/default_layers.asset b/data/assets/scene/solarsystem/planets/mars/default_layers.asset
index db06a922b2..54354cbafd 100644
--- a/data/assets/scene/solarsystem/planets/mars/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/mars/default_layers.asset
@@ -23,7 +23,8 @@ asset.require(colorLayersPath .. "/hirisels")
 
 -- Height layers
 asset.require(heightLayersPath .. "/mola_europe")
-local heightLayer = asset.require(heightLayersPath .. "/mola_utah")
+asset.require(heightLayersPath .. "/mola_utah")
+local heightLayer = asset.require(heightLayersPath .. "/MDEM200M")
 asset.require(heightLayersPath .. "/hirisels")
 
 -- Overlays
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset
new file mode 100644
index 0000000000..fefc177186
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset
@@ -0,0 +1,35 @@
+local mapServiceConfigs = asset.localResource("./../../map_service_configs")
+local globeIdentifier = asset.require("./../../mars").Mars.Identifier
+
+local layer = {
+  Identifier = "MDEM200M",
+  Name = "HRSC MOLA Blended DEM Global 200m v2",
+  FilePath = mapServiceConfigs .. "/ESRI/MDEM200M.tif",
+  Description = [[ Blend of data derived from the Mars Orbiter Laser Altimeter 
+    (MOLA, an instrument aboard NASA’s
+    Mars Global Surveyor spacecraft), and data derived from the High-Resolution
+    Stereo Camera (HRSC, an instrument aboard the European Space Agency’s Mars 
+    Express spacecraft). The average accuracy is ~100 meters in horizontal 
+    position and the elevation uncertainty is at least ±3 m. This
+    tiled elevation layer, hosted by Esri, is made available using
+    lossless LERC compression.(Description from URL).]],
+}
+
+asset.onInitialize(function ()
+  openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
+asset.export("layer", layer)
+
+
+asset.meta = {
+  Name = "Mars HRSC MOLA Blended DEM Global 200m v2",
+  Version = "1.0",
+  Description = [[ESRI Hosted ars HRSC MOLA Blended DEM.]],
+  Author = "esri_astro",
+  URL = "https://www.arcgis.com/home/item.html?id=225adad86379474ebc3d51a74573c99b",
+  License = "Esri Master License Agreement",
+  Identifiers = {"MDEM200M"}
+}
+
+
diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/MDEM200M.tif b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/MDEM200M.tif
new file mode 100644
index 0000000000..11e11e6d3e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/MDEM200M.tif
@@ -0,0 +1,17 @@
+<GDAL_WMS>
+  <Service name="TMS">
+    <ServerUrl>http://astro.arcgis.com/arcgis/rest/services/OnMars/MDEM200M/ImageServer/tile/${z}/${y}/${x}</ServerUrl>
+  </Service>
+  <DataWindow>
+    <UpperLeftX>-180.0</UpperLeftX> <UpperLeftY>90.0</UpperLeftY>
+    <LowerRightX>180.0</LowerRightX> <LowerRightY>-90.0</LowerRightY>
+    <SizeX>131328</SizeX> <SizeY>65664</SizeY>
+    <TileLevel>7</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>513</BlockSizeX> <BlockSizeY>513</BlockSizeY>
+  <BandsCount>1</BandsCount> <DataType>Int16</DataType>
+  <DataValues NoData="-32768" Min="-8528" Max="21226"/>
+  <MaxConnections>5</MaxConnections>
+  <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
+</GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset
index c169c8a568..977d986e99 100644
--- a/data/assets/scene/solarsystem/planets/mars/mars.asset
+++ b/data/assets/scene/solarsystem/planets/mars/mars.asset
@@ -23,21 +23,16 @@ local Mars = {
     SegmentsPerPatch = 90,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/mars.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 14.0,
-      LabelsSize = 9.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 2000000.0,
-      FadeOutStartingDistance = 750000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 2500000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 8.7,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 750000.0, 2000000.0 },
+      DistanceEPS = 2500000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "planet_solarSystem", "planet_terrestrial" },
@@ -54,12 +49,11 @@ local MarsLabel = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "Mars",
-    FontSize = 100.0,
-    LabelSize = 8.5,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Text = "Mars",
+    FontSize = 70.0,
+    Size = 8.66,
+    MinMaxSize = { 1, 100 },
+    OrientationOption = "Camera View Direction",
     BlendMode = "Additive",
     TransformationMatrix = {
       1.0, 0.0, 0.0, -8.0E6,
diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
index f1ea2d6c06..ceb774f5ac 100644
--- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
@@ -24,21 +24,16 @@ local Mercury = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/Mercury.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 22.0,
-      LabelsSize = 10.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 5000000.0,
-      FadeOutStartingDistance = 1800000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 1500000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 10.1,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 1800000.0, 5000000.0 },
+      DistanceEPS = 1500000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "planet_solarSystem", "planet_terrestrial" },
@@ -53,12 +48,11 @@ local MercuryLabel = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "Mercury",
-    FontSize = 100.0,
-    LabelSize = 8.3,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Text = "Mercury",
+    FontSize = 70.0,
+    Size = 8.46,
+    MinMaxSize = { 1, 100 },
+    OrientationOption = "Camera View Direction",
     BlendMode = "Additive"
   },
   Tag = { "solarsystem_labels" },
diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
index 1b53920d46..5700797e14 100644
--- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
@@ -33,12 +33,11 @@ local NeptuneLabel = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "Neptune",
-    FontSize = 100.0,
-    LabelSize = 8.8,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Text = "Neptune",
+    FontSize = 70.0,
+    Size = 8.96,
+    MinMaxSize = { 1, 100 },
+    OrientationOption = "Camera View Direction",
     BlendMode = "Additive"
   },
   Tag = { "solarsystem_labels" },
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
index 1cce3d7e20..f91edea8ed 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
@@ -26,21 +26,16 @@ local Dione = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/dione.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 32.0,
-      LabelsSize = 8.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 3500000.0,
-      FadeOutStartingDistance = 1000000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 200000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 8.7,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 500000.0, 3500000.0 },
+      DistanceEPS = 200000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
index 1f16f3f0bb..87d416faea 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
@@ -26,21 +26,16 @@ local Enceladus = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/enceladus.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 22.0,
-      LabelsSize = 8.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 1000000.0,
-      FadeOutStartingDistance = 500000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 100000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 8.1,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 300000.0, 1000000.0 },
+      DistanceEPS = 100000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
index 77fe207be1..763123733a 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
@@ -26,20 +26,16 @@ local Hyperion = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      -- @TODO (2021-05-21, emmbr26) These labels do not seem to be visible
+      Enabled = false,
       FileName = labelsPath .. "/hyperion.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 14.0,
-      LabelsSize = 8.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      FadeInStartingDistance = 500000.0,
-      FadeOutStartingDistance = 1000000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 1350000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 8.6,
+      FadeInEnabled = true,
+      FadeDistances = { 500000.0, 1000000.0 },
+      DistanceEPS = 1350000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
index 5a33262237..17c3c89c4b 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
@@ -26,21 +26,16 @@ local Iapetus = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/iapetus.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 30.0,
-      LabelsSize = 8.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 3500000.0,
-      FadeOutStartingDistance = 600000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 250000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 8.7,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 600000.0, 3500000.0 },
+      DistanceEPS = 250000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
index 0b9e83521a..a54c8bc981 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
@@ -26,21 +26,16 @@ local Mimas = {
     SegmentsPerPatch = 64,
     Layers = { },
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/mimas.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 14.0,
-      LabelsSize = 8.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 1000000.0,
-      FadeOutStartingDistance = 400000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 25000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 7.7,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 400000.0, 1000000.0 },
+      DistanceEPS = 25000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
index 0c2d323efe..48926b0140 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
@@ -26,21 +26,16 @@ local Rhea = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/rhea.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 40.0,
-      LabelsSize = 8.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 2500000.0,
-      FadeOutStartingDistance = 1000000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 250000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 9.0,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 500000.0, 2500000.0 },
+      DistanceEPS = 250000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
index 555ac5fc63..8a92299d59 100644
--- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
@@ -56,13 +56,12 @@ local SaturnLabel = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "Saturn",
-    FontSize = 100.0,
-    LabelSize = 8.7,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
+    Text = "Saturn",
+    FontSize = 70.0,
+    Size = 8.85,
+    MinMaxSize = { 1, 100 },
     BlendMode = "Additive",
-    LabelOrientationOption = "Camera View Direction"
+    OrientationOption = "Camera View Direction"
   },
   Tag = { "solarsystem_labels" },
   GUI = {
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
index 636081f8af..a87015d37d 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
@@ -26,21 +26,16 @@ local Tethys = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/tethys.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 24.0,
-      LabelsSize = 8.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 1500000.0,
-      FadeOutStartingDistance = 500000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 200000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 8.3,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 500000.0, 1500000.0 },
+      DistanceEPS = 200000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset
index 9159115f6a..faae518b07 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset
@@ -1,7 +1,6 @@
 local colorLayersPath = "./layers/colorlayers"
 
-colorLayer = asset.require(colorLayersPath .. "/titan_texture")
-local colorLayer = asset.require(colorLayersPath .. "/cassini_iss_global_mosaic_4km_liu")
+local colorLayer = asset.require(colorLayersPath .. "/cassini_iss_global_mosaic_4km_local")
 
 -- Set enabled layers (temporary solution)
 -- @TODO: do this using a boolean that's passed to the 'asset.require' instead 
@@ -14,7 +13,7 @@ end)
 asset.meta = {
   Name = "Default Titan Layers",
   Version = "1.0",
-  Description = [[ Default Titan layers are: Titan Texture and Cassini ISS Global
+  Description = [[ Default Titan layers are: Cassini ISS Global
     Mosaic]],
   Author = "OpenSpace Team",
   URL = "http://openspaceproject.com",
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
new file mode 100644
index 0000000000..0356317b58
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
@@ -0,0 +1,34 @@
+local texturesPath = asset.require("./../../titan_textures").TexturesPath
+local globeIdentifier = asset.require("./../../titan").Titan.Identifier
+
+local layer = {
+  Identifier = "Cassini_ISS_Global_Mosaic_4km_Local",
+  Name = "Cassini ISS Global Mosaic 4km",
+  FilePath = texturesPath .. "/Titan_ISS_P19658_Mosaic_Global_4km_os.tif",
+  Description = [[ This global digital map of Saturn's moon Titan was created using
+    images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map
+    was produced in June 2015 using data collected through Cassini's flyby on April 7,
+    2014, known as "T100". The mean radius of Titan used for projection of this map is
+    1,600 miles (2,575 kilometers). Pixel resolution is 4005 meters per pixel (m).
+    Titan is assumed to be spherical until a control network -- a model of the moon's
+    shape based on multiple images tied together at defined points on the surface --
+    is created at some point in the future. (Description from URL)]]
+}
+
+asset.onInitialize(function () 
+  openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+asset.export("layer", layer)
+
+
+asset.meta = {
+  Name = "Cassini ISS Global Mosaic",
+  Version = "1.0",
+  Description = [[ Cassini global image layer for Titan]],
+  Author = "USGS",
+  URL = "https://astrogeology.usgs.gov/search/map/Titan/Cassini/Global-Mosaic/" ..
+    "Titan_ISS_P19658_Mosaic_Global_4km",
+  License = "NASA/PDS",
+  Identifiers = {"Cassini_ISS_Global_Mosaic_4km_Local"}
+}
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset b/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset
deleted file mode 100644
index b9730b43eb..0000000000
--- a/data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset
+++ /dev/null
@@ -1,23 +0,0 @@
-local texturesPath = asset.require("./../../titan_textures").TexturesPath
-local globeIdentifier = asset.require("./../../titan").Titan.Identifier
-
-local layer = {
-  Identifier = "Texture",
-  FilePath = texturesPath .. "/titan.jpg",
-}
-
-asset.onInitialize(function () 
-  openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
-end)
-
-asset.export("layer", layer)
-
-
-asset.meta = {
-  Name = "Titan Texutre",
-  Version = "1.0",
-  Description = [[ Default jpg texture for Titan]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
index fb52863ec2..25e701052e 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
@@ -26,21 +26,16 @@ local Titan = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/titan.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 14.0,
-      LabelsSize = 10.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 7500000.0,
-      FadeOutStartingDistance = 6000000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 1350000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 9.6,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 5000000.0, 7500000.0 },
+      DistanceEPS = 1350000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset
index 6083943b65..d64bdd04f3 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset
@@ -2,6 +2,6 @@ local TexturesPath = asset.syncedResource({
   Type = "HttpSynchronization",
   Name = "Titan textures",
   Identifier = "titan_textures",
-  Version = 1
+  Version = 2
 })
 asset.export("TexturesPath", TexturesPath)
diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
index c08924fd96..80d6add8f7 100644
--- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
@@ -33,12 +33,11 @@ local UranusLabel = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "Uranus",
-    FontSize = 100.0,
-    LabelSize = 8.7,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Text = "Uranus",
+    FontSize = 70.0,
+    Size = 8.86,
+    MinMaxSize = { 1, 100 },
+    OrientationOption = "Camera View Direction",
     BlendMode = "Additive"
   },
   Tag = { "solarsystem_labels" },
diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset
index b07ce04f0c..2e1c74df2a 100644
--- a/data/assets/scene/solarsystem/planets/venus/venus.asset
+++ b/data/assets/scene/solarsystem/planets/venus/venus.asset
@@ -26,22 +26,16 @@ local Venus = {
     SegmentsPerPatch = 64,
     Layers = {},
     Labels = {
-      Enable = false,
+      Enabled = false,
       FileName = labelsPath .. "/venus.labels",
-      LabelAlignmentOption = "Horizontally", -- or Circularly
-      LabelsFontSize = 40.0,
-      LabelsSize = 10.0,
-      LabelsMinSize = 1.0,
-      LabelsMaxSize = 1500.0,
-      ProximityEnabled = false,
-      LabelsFadeInEnabled = true,
-      LabelsFadeInEnabled = true,
-      LabelsFadeOutEnabled = true,
-      FadeInStartingDistance = 7000000.0,
-      FadeOutStartingDistance = 2000000.0,
-      LabelsForceDomeRendering = true,
-      LabelsDistanceEPS = 4000000.0,
-      LabelsColor = { 1.0, 1.0, 0.0 }
+      AlignmentOption = "Horizontally", -- or Circularly
+      FontSize = 20.0,
+      Size = 11.0,
+      FadeInEnabled = true,
+      FadeOutEnabled = true,
+      FadeDistances = { 2000000.0, 7000000.0 },
+      DistanceEPS = 4000000.0,
+      Color = { 1.0, 1.0, 0.0 }
     }
   },
   Tag = { "planet_solarSystem", "planet_terrestrial" },
@@ -53,25 +47,24 @@ local Venus = {
 }
 
 local VenusLabel = {
-    Identifier = "VenusLabel",
-    Parent = Venus.Identifier,
-    Renderable = {
-        Enabled = false,
-        Type = "RenderableLabels",
-        LabelText = "Venus",
-        FontSize = 100.0,
-        LabelSize = 8.4,
-        LabelMaxSize = 100.0,
-        LabelMinSize = 1.0,
-        LabelOrientationOption = "Camera View Direction",
-        BlendMode = "Additive"
-    },
-    Tag = { "solarsystem_labels" },
-    GUI = {
-        Name = "Venus Label",
-        Path = "/Solar System/Planets/Venus",
-        Description = "Label for Venus, viewable within the solar system."
-    }
+  Identifier = "VenusLabel",
+  Parent = Venus.Identifier,
+  Renderable = {
+    Enabled = false,
+    Type = "RenderableLabels",
+    Text = "Venus",
+    FontSize = 70.0,
+    Size = 8.54,
+    MinMaxSize = { 1, 100 },
+    OrientationOption = "Camera View Direction",
+    BlendMode = "Additive"
+  },
+  Tag = { "solarsystem_labels" },
+  GUI = {
+      Name = "Venus Label",
+      Path = "/Solar System/Planets/Venus",
+      Description = "Label for Venus, viewable within the solar system."
+  }
 }
 
 assetHelper.registerSceneGraphNodesAndExport(asset, { Venus, VenusLabel })
diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset
index 7eae833e2d..de53d4aa1b 100644
--- a/data/assets/scene/solarsystem/sun/sun.asset
+++ b/data/assets/scene/solarsystem/sun/sun.asset
@@ -26,20 +26,16 @@ local SunLabel = {
   Renderable = {
     Enabled = false,
     Type = "RenderableLabels",
-    LabelText = "Sun",
-    FontSize = 100.0,
-    LabelSize = 13.127,
-    LabelMaxSize = 100.0,
-    LabelMinSize = 1.0,
-    LabelOrientationOption = "Camera View Direction",
+    Text = "Sun",
+    FontSize = 70.0,
+    Size = 14.17,
+    MinMaxSize = { 1, 50 },
+    OrientationOption = "Camera View Direction",
     BlendMode = "Additive",
     EnableFading = true,
-    FadeStartUnit = "Pm",
-    FadeStartDistance = 2.841,
-    FadeStartSpeed = 1.375,
-    FadeEndUnit = "pc",
-    FadeEndDistance = 1.326,
-    FadeEndSpeed = 1.0
+    FadeUnit = "pc",
+    FadeDistances = { 1.33, 15.0 },
+    FadeWidths = { 1.0, 20.0 }
   },
   Tag = { "solarsystem_labels" },
   GUI = {
diff --git a/data/assets/util/add_marker.asset b/data/assets/util/add_marker.asset
new file mode 100644
index 0000000000..1d62a2f00c
--- /dev/null
+++ b/data/assets/util/add_marker.asset
@@ -0,0 +1,19 @@
+local icons = asset.syncedResource({
+  Name = "Icons",
+  Type = "HttpSynchronization",
+  Identifier = "icons",
+  Version = 1
+})
+
+asset.onInitialize(function()
+  openspace.addScreenSpaceRenderable({
+    Identifier = "target-marker",
+    Name = "Target Marker",
+    Type = "ScreenSpaceImageLocal",
+    TexturePath = icons .. '/target.png'
+  })
+end)
+
+asset.onDeinitialize(function()
+  openspace.removeScreenSpaceRenderable('target-marker');
+end)
diff --git a/data/assets/util/circle.asset b/data/assets/util/circle.asset
new file mode 100644
index 0000000000..4717b87883
--- /dev/null
+++ b/data/assets/util/circle.asset
@@ -0,0 +1,8 @@
+local circle = asset.syncedResource({
+  Name = "Circle",
+  Type = "HttpSynchronization",
+  Identifier = "circle_image",
+  Version = 1
+})
+
+asset.export('circle', circle)
diff --git a/data/assets/util/default_joystick.asset b/data/assets/util/default_joystick.asset
index e511364fff..8ecce48410 100644
--- a/data/assets/util/default_joystick.asset
+++ b/data/assets/util/default_joystick.asset
@@ -4,6 +4,7 @@ local propertyHelper = asset.require('./property_helper')
 -- "None"
 -- "Orbit X"
 -- "Orbit Y"
+-- "Zoom" -- both in and out
 -- "Zoom In"
 -- "Zoom Out"
 -- "LocalRoll X"
@@ -44,10 +45,10 @@ local PS4Controller = {
   RightThumbStick = { 2, 5 },
   LeftTrigger = 3,
   RightTrigger = 4,
-  A = 3, -- Triangle
-  B = 0, -- Square
-  X = 2, -- Circle
-  Y = 1, -- Cross
+  A = 1, -- Cross
+  B = 2, -- Circle
+  X = 0, -- Square
+  Y = 3, -- Triangle
   LB = 4,
   RB = 5,
   Select = 9, -- options
@@ -62,6 +63,14 @@ local PS4Controller = {
   }
 }
 
+local SpaceMouse = {
+  Push = {0, 1, 2}, -- left/right, back/forth, up/down
+  Twist = {5}, -- left/right
+  Tilt = {4, 3}, -- left/right, back/forth
+  LeftButton = 0,
+  RightButton = 1
+}
+
 -- Variables to store the state of the joystick between frames
 Joystick = {}
 Joystick.State = {}
@@ -73,11 +82,11 @@ local bindLocalRoll = function(axis)
     -- We only want to store the current state in the first mode that is enabled, otherwise we will overwrite the backup
     if not Joystick.State.IsInRollMode then
       -- Save current axis state
-      Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized = openspace.navigation.joystickAxis(]] .. axis .. [[)
+      Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized, Joystick.State.Axis.Sticky, Joystick.State.Axis.Sensitivity = openspace.navigation.joystickAxis(]] .. axis .. [[)
     end
 
     -- Set new axis state
-    openspace.navigation.bindJoystickAxis(]] .. axis .. [[, "LocalRoll X", true);
+    openspace.navigation.bindJoystickAxis(]] .. axis .. [[, "LocalRoll X", Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized, Joystick.State.Axis.Sticky, Joystick.State.Axis.Sensitivity);
     Joystick.State.IsInRollMode = true
   ]]
 end
@@ -87,88 +96,133 @@ local bindGlobalRoll = function(axis)
     -- We only want to store the current state in the first mode that is enabled, otherwise we will overwrite the backup
     if not Joystick.State.IsInRollMode then
       -- Save current axis state
-      Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized = openspace.navigation.joystickAxis(]] .. axis .. [[)
+      Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized, Joystick.State.Axis.Sticky, Joystick.State.Axis.Sensitivity = openspace.navigation.joystickAxis(]] .. axis .. [[)
     end
 
     -- Set new axis state
-    openspace.navigation.bindJoystickAxis(]] .. axis .. [[, "GlobalRoll X", true);
+    openspace.navigation.bindJoystickAxis(]] .. axis .. [[, "GlobalRoll X", Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized, Joystick.State.Axis.Sticky, Joystick.State.Axis.Sensitivity);
     Joystick.State.IsInRollMode = true
   ]]
 end
 
+local permaBindLocalRoll = function(axis)
+  return [[
+    -- Save current axis state
+    Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized, Joystick.State.Axis.Sticky, Joystick.State.Axis.Sensitivity = openspace.navigation.joystickAxis(]] .. axis .. [[)
+
+    -- Set new axis state
+    openspace.navigation.bindJoystickAxis(]] .. axis .. [[, "LocalRoll X", Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized, Joystick.State.Axis.Sticky, Joystick.State.Axis.Sensitivity);
+  ]]
+end
+
+local permaBindGlobalRoll = function(axis)
+  return [[
+    -- Save current axis state
+    Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized, Joystick.State.Axis.Sticky, Joystick.State.Axis.Sensitivity = openspace.navigation.joystickAxis(]] .. axis .. [[)
+
+    -- Set new axis state
+    openspace.navigation.bindJoystickAxis(]] .. axis .. [[, "GlobalRoll X", Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized, Joystick.State.Axis.Sticky, Joystick.State.Axis.Sensitivity);
+  ]]
+end
+
 local unbindRoll = function(axis)
   return [[
     -- Reset previous state
-    openspace.navigation.bindJoystickAxis(]] .. axis .. [[, Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized);
+    openspace.navigation.bindJoystickAxis(]] .. axis .. [[, Joystick.State.Axis.Type, Joystick.State.Axis.Inverted, Joystick.State.Axis.Normalized, Joystick.State.Axis.Sticky, Joystick.State.Axis.Sensitivity);
   ]]
 end
 
 asset.onInitialize(function()
   -- Set the controller to the connected controller
-  -- Currently:  XBoxController  or  PS4Controller
+  -- Currently:  XBoxController, PS4Controller or SpaceMouse
   local controller = XBoxController;
 
-  openspace.navigation.setAxisDeadZone(controller.LeftThumbStick[1], 0.15)
-  openspace.navigation.setAxisDeadZone(controller.LeftThumbStick[2], 0.15)
-  openspace.navigation.setAxisDeadZone(controller.RightThumbStick[1], 0.15)
-  openspace.navigation.setAxisDeadZone(controller.RightThumbStick[2], 0.15)
-  openspace.navigation.setAxisDeadZone(controller.LeftTrigger, 0.15)
-  openspace.navigation.setAxisDeadZone(controller.RightTrigger, 0.15)
+  -- Case of XBoxController or PS4Controller
+  if(controller.A ~= nil) then
+    openspace.navigation.setAxisDeadZone(controller.LeftThumbStick[1], 0.15)
+    openspace.navigation.setAxisDeadZone(controller.LeftThumbStick[2], 0.15)
+    openspace.navigation.setAxisDeadZone(controller.RightThumbStick[1], 0.15)
+    openspace.navigation.setAxisDeadZone(controller.RightThumbStick[2], 0.15)
 
-  openspace.navigation.bindJoystickAxis(controller.LeftThumbStick[1], "Orbit X");
-  openspace.navigation.bindJoystickAxis(controller.LeftThumbStick[2], "Orbit Y", true);
-  openspace.navigation.bindJoystickAxis(controller.RightThumbStick[1], "Pan X", true);
-  openspace.navigation.bindJoystickAxis(controller.RightThumbStick[2], "Pan Y", true);
-  openspace.navigation.bindJoystickAxis(controller.LeftTrigger, "Zoom Out", false, true);
-  openspace.navigation.bindJoystickAxis(controller.RightTrigger, "Zoom In", false, true);
+    openspace.navigation.bindJoystickAxis(controller.LeftThumbStick[1], "Orbit X");
+    openspace.navigation.bindJoystickAxis(controller.LeftThumbStick[2], "Orbit Y", true);
+    openspace.navigation.bindJoystickAxis(controller.RightThumbStick[1], "Pan X", true);
+    openspace.navigation.bindJoystickAxis(controller.RightThumbStick[2], "Pan Y", true);
+    openspace.navigation.bindJoystickAxis(controller.LeftTrigger, "Zoom Out", false, true);
+    openspace.navigation.bindJoystickAxis(controller.RightTrigger, "Zoom In", false, true);
 
-  openspace.navigation.bindJoystickButton(
-    controller.LB,
-    bindLocalRoll(controller.RightThumbStick[1]),
-    "Switch to local roll mode"
-  )
-  openspace.navigation.bindJoystickButton(
-    controller.LB,
-    unbindRoll(controller.RightThumbStick[1]),
-    "Switch back to normal mode",
-    "Release"
-  )
-  openspace.navigation.bindJoystickButton(
-    controller.RB,
-    bindGlobalRoll(controller.RightThumbStick[1]),
-    "Switch to global roll mode"
-  )
-  openspace.navigation.bindJoystickButton(
-    controller.RB,
-    unbindRoll(controller.RightThumbStick[1]),
-    "Switch back to normal mode",
-    "Release"
-  )
+    openspace.navigation.bindJoystickButton(
+      controller.LB,
+      bindLocalRoll(controller.RightThumbStick[1]),
+      "Switch to local roll mode"
+    )
+    openspace.navigation.bindJoystickButton(
+      controller.LB,
+      unbindRoll(controller.RightThumbStick[1]),
+      "Switch back to normal mode",
+      "Release"
+    )
+    openspace.navigation.bindJoystickButton(
+      controller.RB,
+      bindGlobalRoll(controller.RightThumbStick[1]),
+      "Switch to global roll mode"
+    )
+    openspace.navigation.bindJoystickButton(
+      controller.RB,
+      unbindRoll(controller.RightThumbStick[1]),
+      "Switch back to normal mode",
+      "Release"
+    )
 
-  openspace.navigation.bindJoystickButton(
-    controller.A,
-    propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.ZoomFriction'),
-    "Toggle zoom friction"
-  )
-  openspace.navigation.bindJoystickButton(
-    controller.B,
-    propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RotationalFriction'),
-    "Toggle rotational friction"
-  )
-  openspace.navigation.bindJoystickButton(
-    controller.DPad.Left,
-    propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RollFriction'),
-    "Toggle roll friction"
-  )
+    openspace.navigation.bindJoystickButton(
+      controller.A,
+      propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.ZoomFriction'),
+      "Toggle zoom friction"
+    )
+    openspace.navigation.bindJoystickButton(
+      controller.B,
+      propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RotationalFriction'),
+      "Toggle rotational friction"
+    )
+    openspace.navigation.bindJoystickButton(
+      controller.DPad.Left,
+      propertyHelper.invert('NavigationHandler.OrbitalNavigator.Friction.RollFriction'),
+      "Toggle roll friction"
+    )
 
-  openspace.navigation.bindJoystickButton(
-    controller.X,
-    "openspace.setPropertyValue('NavigationHandler.Origin', 'Earth')",
-    "Switch target to Earth"
-  )
-  openspace.navigation.bindJoystickButton(
-    controller.Y,
-    "openspace.setPropertyValue('NavigationHandler.Origin', 'Mars')",
-    "Switch target to Mars"
-  )
+    openspace.navigation.bindJoystickButton(
+      controller.X,
+      "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');" ..
+      "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth');" ..
+      "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);",
+      "Switch target to Earth"
+    )
+    openspace.navigation.bindJoystickButton(
+      controller.Y,
+      "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');" ..
+      "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Mars');" ..
+      "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);",
+      "Switch target to Mars"
+    )
+  -- Case of SpaceMouse
+  elseif (controller.LeftButton ~= nil) then
+    openspace.navigation.bindJoystickAxis(controller.Push[1], "Orbit X", false, false, true, 40.0);
+    openspace.navigation.bindJoystickAxis(controller.Push[2], "Orbit Y", false, false, true, 40.0);
+    openspace.navigation.bindJoystickAxis(controller.Twist[1], "Pan X", true, false, true, 40.0);
+    openspace.navigation.bindJoystickAxis(controller.Tilt[2], "Pan Y", false, false, true, 35.0);
+    openspace.navigation.bindJoystickAxis(controller.Push[3], "Zoom", false, false, true, 40.0);
+    openspace.navigation.bindJoystickAxis(controller.Tilt[1], "LocalRoll X", false, false, true, 35.0);
+
+    openspace.navigation.bindJoystickButton(
+      controller.LeftButton,
+      permaBindLocalRoll(controller.Tilt[1]),
+      "Switch to local roll mode"
+    )
+
+    openspace.navigation.bindJoystickButton(
+      controller.RightButton,
+      permaBindGlobalRoll(controller.Tilt[1]),
+      "Switch to global roll mode"
+    )
+  end
 end)
diff --git a/data/assets/util/default_keybindings.asset b/data/assets/util/default_keybindings.asset
index d178200ed0..05a5cdcc10 100644
--- a/data/assets/util/default_keybindings.asset
+++ b/data/assets/util/default_keybindings.asset
@@ -36,7 +36,7 @@ local Keybindings = {
   {
     Key = "SPACE",
     Name = "Toggle Pause (Interpolated)",
-    Command = "openspace.time.interpolateTogglePause()",
+    Command = "openspace.time.pauseToggleViaKeyboard()",
     Documentation = "Smoothly starts and stops the simulation time.",
     GuiPath = "/Simulation Speed",
     Local = true
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 9be28c5d6f..85263c7e8b 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 = "391f8d3ed74e598a0e8a1b16016324d8f747e18d"
+local frontendHash = "7fed95043e967c632b446ae1c98c6390f3fb7edc"
 local dataProvider = "data.openspaceproject.com/files/webgui"
 
 local frontend = asset.syncedResource({
diff --git a/data/profiles/jwst.profile b/data/profiles/jwst.profile
new file mode 100644
index 0000000000..d273706c84
--- /dev/null
+++ b/data/profiles/jwst.profile
@@ -0,0 +1,112 @@
+{
+  "assets": [
+    "base",
+    "scene/solarsystem/planets/earth/earth",
+    "scene/solarsystem/planets/earth/satellites/satellites",
+    "scene/solarsystem/missions/jwst/jwst",
+    "scene/solarsystem/missions/jwst/HUDFImage",
+    "scene/digitaluniverse/hdf"
+  ],
+  "camera": {
+    "altitude": 17000000.0,
+    "anchor": "Earth",
+    "latitude": 3.5559,
+    "longitude": -53.0515,
+    "type": "goToGeo"
+  },
+  "delta_times": [
+    1.0,
+    5.0,
+    30.0,
+    60.0,
+    300.0,
+    1800.0,
+    3600.0,
+    43200.0,
+    86400.0,
+    604800.0,
+    1209600.0,
+    2592000.0,
+    5184000.0,
+    7776000.0,
+    15552000.0,
+    31536000.0,
+    63072000.0,
+    157680000.0,
+    315360000.0,
+    630720000.0
+  ],
+  "keybindings": [
+    {
+      "documentation": "Toggle trails on or off for satellites around Earth",
+      "gui_path": "/Earth",
+      "is_local": false,
+      "key": "S",
+      "name": "Toggle satellite trails",
+      "script": "local list = openspace.getProperty('{earth_satellites}.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",
+      "gui_path": "/JWST",
+      "is_local": false,
+      "key": "P",
+      "name": "Toggle Lagrangian points",
+      "script": "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 Hubble Ultra Deep Field image and line towards its coordinate",
+      "gui_path": "/JWST",
+      "is_local": false,
+      "key": "U",
+      "name": "Toggle Hubble Ultra Deep Field",
+      "script": "local list = openspace.getProperty('{mission_jwst_hudf}.*.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end"
+    },
+    {
+      "documentation": "Toggle L2 label, point and line",
+      "gui_path": "/JWST",
+      "is_local": false,
+      "key": "O",
+      "name": "Toggle L2",
+      "script": "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 James Webb Space Telecope field of view and view band",
+      "gui_path": "/JWST",
+      "is_local": false,
+      "key": "V",
+      "name": "Toggle JWST field of view and view band",
+      "script": "local list = openspace.getProperty('{mission_jwst_fov}.*.Enabled'); for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end"
+    }
+  ],
+  "mark_nodes": [
+    "JWSTModel",
+    "JWSTTrail",
+    "L2",
+    "Earth",
+    "Moon",
+    "Sun"
+  ],
+  "meta": {
+    "author": "OpenSpace Team",
+    "description": "James Webb Space Telescope Profile. Adds the James Webb Space Telescope model with an estimated trajectery.",
+    "license": "MIT License",
+    "name": "James Webb Space Telescope",
+    "url": "https://www.openspaceproject.com",
+    "version": "1.0"
+  },
+  "properties": [
+    {
+      "name": "{earth_satellites}.Renderable.Enabled",
+      "type": "setPropertyValue",
+      "value": "false"
+    }
+  ],
+  "time": {
+    "type": "absolute",
+    "value": "2021-10-31T00:00:00"
+  },
+  "version": {
+    "major": 1,
+    "minor": 0
+  }
+}
diff --git a/data/profiles/mars.profile b/data/profiles/mars.profile
index 87493a7562..eb730ff151 100644
--- a/data/profiles/mars.profile
+++ b/data/profiles/mars.profile
@@ -39,7 +39,7 @@
       "is_local": false,
       "key": "I",
       "name": "Setup scene for insight EDL",
-      "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -469.300000);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', -470.800006);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled', true);openspace.time.setPause(true);openspace.time.setTime('2018 NOV 26 19:39:03.68');openspace.navigation.setNavigationState({Anchor = 'Insight',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});"
+      "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -469.300000);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', -470.800006);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled', true);openspace.time.setPause(true);openspace.time.setTime('2018 NOV 26 19:39:01.68');openspace.navigation.setNavigationState({Anchor = 'Insight',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});"
     },
     {
       "documentation": "Disable Mars layer settings used for insight EDL",
@@ -55,7 +55,7 @@
       "is_local": false,
       "key": "P",
       "name": "Setup and Goto Perseverance",
-      "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1677.088867);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', -1677.088867);openspace.time.setPause(true);openspace.time.setTime('2021 FEB 18 20:32:16');openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled', true);openspace.navigation.setNavigationState({Anchor = 'Perseverance',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});"
+      "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1674.0);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', -1674.0);openspace.time.setPause(true);openspace.time.setTime('2021 FEB 18 20:32:16');openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled', true);openspace.navigation.setNavigationState({Anchor = 'Perseverance',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});"
     }
   ],
   "mark_nodes": [
@@ -77,6 +77,6 @@
   },
   "version": {
     "major": 1,
-    "minor": 1
+    "minor": 2
   }
 }
\ No newline at end of file
diff --git a/data/profiles/newhorizons.profile b/data/profiles/newhorizons.profile
index 7f30857769..f66c34681d 100644
--- a/data/profiles/newhorizons.profile
+++ b/data/profiles/newhorizons.profile
@@ -216,7 +216,7 @@
     "license": "MIT License",
     "name": "New Horizons",
     "url": "https://www.openspaceproject.com",
-    "version": "1.0"
+    "version": "1.1"
   },
   "properties": [
     {
@@ -233,6 +233,11 @@
       "name": "Scene.PlutoBarycenterTrail.Renderable.Enabled",
       "type": "setPropertyValue",
       "value": "false"
+    },
+    {
+      "name": "Scene.PlutoProjection.Renderable.ColorTexturePaths",
+      "type": "setPropertyValue",
+      "value": "1.000000"
     }
   ],
   "time": {
diff --git a/data/profiles/osirisrex.profile b/data/profiles/osirisrex.profile
index 94aebc6939..a6b9399bcb 100644
--- a/data/profiles/osirisrex.profile
+++ b/data/profiles/osirisrex.profile
@@ -3,7 +3,8 @@
     "base",
     "scene/solarsystem/missions/osirisrex/dashboard",
     "scene/solarsystem/missions/osirisrex/model",
-    "scene/solarsystem/missions/osirisrex/osirisrex"
+    "scene/solarsystem/missions/osirisrex/osirisrex",
+    "scene/solarsystem/missions/osirisrex/imageplane"
   ],
   "camera": {
     "aim": "",
diff --git a/data/web/documentation/toplevel.hbs b/data/web/documentation/toplevel.hbs
index 3701dd057a..2fe96f3313 100644
--- a/data/web/documentation/toplevel.hbs
+++ b/data/web/documentation/toplevel.hbs
@@ -22,7 +22,7 @@
         {{/with}}
         {{#if reference}}
           {{#if reference.found}}
-            <p class="documentation-description">An object of type '<a href="#{{reference.identifier}}">{{reference.name}}</a>'</p>
+            <p class="documentation-description">An object of type '<a href="#{{reference.name}}">{{reference.name}}</a>'</p>
           {{else}}
             <p class="documentation-description">Missing reference</p>
           {{/if}}
diff --git a/ext/ghoul b/ext/ghoul
index 8f17cc57d9..fcb8e8b964 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 8f17cc57d95cb5682aed07e087feb47d06824503
+Subproject commit fcb8e8b964c9c176733f4fdc22d117cac8d3f8b2
diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h
index 39ed62320e..a5c17c8622 100644
--- a/include/openspace/documentation/documentation.h
+++ b/include/openspace/documentation/documentation.h
@@ -93,7 +93,7 @@ struct TestResult {
 
 
     /// Is \c true if the TestResult is positive, \c false otherwise
-    bool success;
+    bool success = false;
     /// Contains a list of offenses that were found in the test. Is empty if
     /// TestResult::Success is \c true
     std::vector<Offense> offenses;
diff --git a/include/openspace/documentation/documentationgenerator.h b/include/openspace/documentation/documentationgenerator.h
index 103187675f..248fa4ea22 100644
--- a/include/openspace/documentation/documentationgenerator.h
+++ b/include/openspace/documentation/documentationgenerator.h
@@ -94,24 +94,6 @@ private:
     const std::vector<HandlebarTemplate> _handlebarTemplates;
 };
 
-/**
- * This function takes a \p text and escapes all necessary characters () that JSON
- * does not want in its strings.
- * \param text The text that is to be escaped
- * \return The same text will all required characteres escaped
- */
-std::string escapedJson(const std::string& text);
-
-
-/**
- * This function takes a \p list of text and escapes all necessary characters () that JSON
- * does not want in its strings.
- * \param text The list text that is to be escaped
- * \return The same text will all required characteres escaped
- */
-std::string escapedJson(const std::vector<std::string>& list);
-
-
 } // namespace openspace
 
 #endif // __OPENSPACE_CORE___DOCUMENTATIONGENERATOR___H__
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index 98fbb8518c..83970d9fdf 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -27,6 +27,7 @@
 
 #include <ghoul/lua/luastate.h>
 #include <ghoul/misc/dictionary.h>
+#include <filesystem>
 #include <map>
 #include <string>
 #include <vector>
@@ -85,7 +86,7 @@ struct Configuration {
     bool shouldUseScreenshotDate = false;
 
     std::string onScreenTextScaling = "window";
-    bool usePerSceneCache = false;
+    bool usePerProfileCache = false;
 
     bool isRenderingOnMasterDisabled = false;
     glm::dvec3 globalRotation = glm::dvec3(0.0);
@@ -129,9 +130,9 @@ struct Configuration {
     ghoul::lua::LuaState state;
 };
 
-std::string findConfiguration(const std::string& filename = "openspace.cfg");
+std::filesystem::path findConfiguration(const std::string& filename = "openspace.cfg");
 
-Configuration loadConfigurationFromFile(const std::string& filename,
+Configuration loadConfigurationFromFile(const std::filesystem::path& filename,
     const std::string& overrideScript);
 
 } // namespace openspace::configuration
diff --git a/include/openspace/engine/downloadmanager.h b/include/openspace/engine/downloadmanager.h
index 26b0fa21f6..1bfb97a229 100644
--- a/include/openspace/engine/downloadmanager.h
+++ b/include/openspace/engine/downloadmanager.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_CORE___DOWNLOADMANAGER___H__
 
 #include <ghoul/misc/boolean.h>
+#include <filesystem>
 #include <functional>
 #include <future>
 #include <memory>
@@ -99,7 +100,7 @@ public:
     // finishedCallback - callback when download finished (happens on different thread)
     // progressCallback - callback for status during (happens on different thread)
     std::shared_ptr<FileFuture> downloadFile(const std::string& url,
-        const ghoul::filesystem::File& file,
+        const std::filesystem::path& file,
         OverrideFile overrideFile = OverrideFile::Yes,
         FailOnError failOnError = FailOnError::No, unsigned int timeout_secs = 0,
         DownloadFinishedCallback finishedCallback = DownloadFinishedCallback(),
diff --git a/include/openspace/interaction/joystickcamerastates.h b/include/openspace/interaction/joystickcamerastates.h
index fd0098e933..15188faf26 100644
--- a/include/openspace/interaction/joystickcamerastates.h
+++ b/include/openspace/interaction/joystickcamerastates.h
@@ -43,6 +43,7 @@ public:
         OrbitY,
         ZoomIn,
         ZoomOut,
+        Zoom,
         LocalRollX,
         LocalRollY,
         GlobalRollX,
@@ -60,7 +61,15 @@ public:
         AxisInvert invert = AxisInvert::No;
         AxisNormalize normalize = AxisNormalize::No;
 
+        // The axis values can either go back to 0 when the joystick is released or it can
+        // stay at the value it was before the joystick was released.
+        // The latter is called a sticky axis, when the values don't go back to 0.
+        bool isSticky = false;
+
         float deadzone = 0.f;
+
+        // Every axis can have their own sensitivity
+        double sensitivity = 0.0;
     };
 
     JoystickCameraStates(double sensitivity, double velocityScaleFactor);
@@ -69,7 +78,8 @@ public:
 
     void setAxisMapping(int axis, AxisType mapping,
         AxisInvert shouldInvert = AxisInvert::No,
-        AxisNormalize shouldNormalize = AxisNormalize::No
+        AxisNormalize shouldNormalize = AxisNormalize::No,
+        bool isSticky = false, double sensitivity = 0.0
     );
 
     AxisInformation axisMapping(int axis) const;
@@ -91,6 +101,10 @@ private:
 
     std::array<AxisInformation, JoystickInputState::MaxAxes> _axisMapping;
 
+    // This array is used to store the old axis values from the previous frame,
+    // it is used to calculate the difference in the values in the case of a sticky axis
+    std::array<float, JoystickInputState::MaxAxes> _prevAxisValues;
+
     struct ButtonInformation {
         std::string command;
         JoystickAction action;
@@ -135,6 +149,7 @@ from_string(std::string_view string)
     if (string == "None") { return T::None; }
     if (string == "Orbit X") { return T::OrbitX; }
     if (string == "Orbit Y") { return T::OrbitY; }
+    if (string == "Zoom") { return T::Zoom; }
     if (string == "Zoom In") { return T::ZoomIn; }
     if (string == "Zoom Out") { return T::ZoomOut; }
     if (string == "LocalRoll X") { return T::LocalRollX; }
diff --git a/include/openspace/interaction/joystickinputstate.h b/include/openspace/interaction/joystickinputstate.h
index ced81f4013..c5d320c7b8 100644
--- a/include/openspace/interaction/joystickinputstate.h
+++ b/include/openspace/interaction/joystickinputstate.h
@@ -71,6 +71,11 @@ struct JoystickInputState {
     /// \c nAxes values are defined values, the rest are undefined
     std::array<float, MaxAxes> axes;
 
+    /// The axis values can either go back to 0 when the joystick is released or it can
+    /// stay at the value it was before the joystick was released.
+    /// The latter is called a sticky axis, when the values don't go back to 0.
+    bool isSticky = false;
+
     /// The number of buttons that this joystick possesses
     int nButtons = 0;
     /// The status of each button. Only the first \c nButtons values are defined, the rest
diff --git a/include/openspace/interaction/navigationhandler.h b/include/openspace/interaction/navigationhandler.h
index 68d34498b2..15d080330b 100644
--- a/include/openspace/interaction/navigationhandler.h
+++ b/include/openspace/interaction/navigationhandler.h
@@ -115,7 +115,8 @@ public:
         JoystickCameraStates::AxisInvert shouldInvert =
             JoystickCameraStates::AxisInvert::No,
         JoystickCameraStates::AxisNormalize shouldNormalize =
-            JoystickCameraStates::AxisNormalize::No
+            JoystickCameraStates::AxisNormalize::No,
+        bool isSticky = false, double sensitivity = 0.0
     );
 
     JoystickCameraStates::AxisInformation joystickAxisMapping(int axis) const;
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 51aaaf6686..749f7badfe 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -30,6 +30,7 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/scripting/lualibrary.h>
 #include <vector>
+#include <chrono>
 
 namespace openspace::interaction {
 
@@ -60,7 +61,8 @@ public:
     enum class SessionState {
         Idle = 0,
         Recording,
-        Playback
+        Playback,
+        PlaybackPaused
     };
 
     struct Timestamps {
@@ -69,6 +71,18 @@ public:
         double timeSim;
     };
 
+    /*
+     * Struct for storing a script substring that, if found in a saved script,
+     * will be replaced by its substringReplacement counterpart.
+     */
+    struct ScriptSubstringReplace {
+        std::string substringFound;
+        std::string substringReplacement;
+        ScriptSubstringReplace(std::string found, std::string replace)
+            : substringFound(found)
+            , substringReplacement(replace) {};
+    };
+
     static const size_t FileHeaderVersionLength = 5;
     char FileHeaderVersion[FileHeaderVersionLength+1] = "01.00";
     char TargetConvertVersion[FileHeaderVersionLength+1] = "01.00";
@@ -117,6 +131,20 @@ public:
      */
     double fixedDeltaTimeDuringFrameOutput() const;
 
+    /**
+     * Returns the number of microseconds that have elapsed since playback started, if
+     * playback is set to be in the mode where a screenshot is captured with every
+     * rendered frame (enableTakeScreenShotDuringPlayback() is used to enable this mode).
+     * At the start of playback, this timer is set to the current steady_clock value.
+     * However, during playback it is incremented by the fixed framerate of the playback
+     * rather than the actual clock value (as in normal operation).
+     *
+     * \returns number of microseconds elapsed since playback started in terms of the
+     *          number of rendered frames multiplied by the fixed time increment per
+     *          frame
+     */
+    std::chrono::steady_clock::time_point currentPlaybackInterpolationTime() const;
+
     /**
      * Starts a recording session, which will save data to the provided filename
      * according to the data format specified, and will continue until recording is
@@ -154,16 +182,20 @@ public:
     /**
      * Starts a playback session, which can run in one of three different time modes.
      *
-     * \param filename file containing recorded keyframes to play back
+     * \param filename file containing recorded keyframes to play back. The file path
+     *                 is relative to the base recordings directory specified in the
+     *                 config file by the RECORDINGS variable
      * \param timeMode which of the 3 time modes to use for time reference during
      * \param forceSimTimeAtStart if true simulation time is forced to that of playback
      *        playback: recorded time, application time, or simulation time. See the
      *        LuaLibrary entry for SessionRecording for details on these time modes
+     * \param loop if true then the file will playback in loop mode, continuously
+     *             looping back to the beginning until it is manually stopped
      *
      * \return \c true if recording to file starts without errors
      */
     bool startPlayback(std::string& filename, KeyframeTimeRef timeMode,
-        bool forceSimTimeAtStart);
+        bool forceSimTimeAtStart, bool loop);
 
     /**
      * Used to stop a playback in progress. If open, the playback file will be closed,
@@ -171,6 +203,22 @@ public:
      */
     void stopPlayback();
 
+    /**
+     * Returns playback pause status.
+     *
+     * \return \c true if playback is paused
+     */
+    bool isPlaybackPaused();
+
+    /**
+     * Pauses a playback session. This does both the normal pause functionality of
+     * setting simulation delta time to zero, and pausing the progression through the
+     * timeline.
+     *
+     * \param pause if true, then will set playback timeline progression to zero
+     */
+    void setPlaybackPause(bool pause);
+
     /**
      * Enables that rendered frames should be saved during playback
      * \param fps Number of frames per second.
@@ -205,13 +253,13 @@ public:
      * whether it is following the rotation of a node, and timestamp). The data will be
      * saved to the recording file only if a recording is currently in progress.
      */
-    void saveCameraKeyframe();
+    void saveCameraKeyframeToTimeline();
 
     /**
      * Used to trigger a save of the current timing states. The data will be saved to the
      * recording file only if a recording is currently in progress.
      */
-    void saveTimeKeyframe();
+    void saveTimeKeyframeToTimeline();
 
     /**
      * Used to trigger a save of a script to the recording file, but only if a recording
@@ -219,7 +267,7 @@ public:
      *
      * \param scriptToSave String of the Lua command to be saved
      */
-    void saveScriptKeyframe(std::string scriptToSave);
+    void saveScriptKeyframeToTimeline(std::string scriptToSave);
 
     /**
      * \return The Lua library that contains all Lua functions available to affect the
@@ -405,6 +453,19 @@ public:
     void saveScriptKeyframeAscii(Timestamps& times,
         datamessagestructures::ScriptMessage& sm, std::ofstream& file);
 
+    /**
+     * Since session recordings only record changes, the initial conditions aren't
+     * preserved when a playback starts. This function is called whenever a property
+     * value is set and a recording is in progress. Before the set happens, this
+     * function will read the current value of the property and store it so that when
+     * the recording is finished, the initial state will be added as a set property
+     * command at the beginning of the recording file, to be applied when playback
+     * starts.
+     *
+     * \param prop The property being set
+     */
+    void savePropertyBaseline(properties::Property& prop);
+
     /**
      * Reads header information from a session recording file
      *
@@ -524,17 +585,20 @@ protected:
     struct timelineEntry {
         RecordedType keyframeType;
         unsigned int idxIntoKeyframeTypeArray;
-        double timestamp;
+        Timestamps t3stamps;
     };
     ExternInteraction _externInteract;
     double _timestampRecordStarted = 0.0;
+    Timestamps _timestamps3RecordStarted;
     double _timestampPlaybackStarted_application = 0.0;
     double _timestampPlaybackStarted_simulation = 0.0;
     double _timestampApplicationStarted_simulation = 0.0;
     bool hasCameraChangedFromPrev(datamessagestructures::CameraKeyframe kfNew);
-    double appropriateTimestamp(double timeOs, double timeRec, double timeSim);
+    double appropriateTimestamp(Timestamps t3stamps);
     double equivalentSimulationTime(double timeOs, double timeRec, double timeSim);
     double equivalentApplicationTime(double timeOs, double timeRec, double timeSim);
+    void recordCurrentTimePauseState();
+    void recordCurrentTimeRate();
     bool handleRecordingFile(std::string filenameIn);
     static bool isPath(std::string& filename);
     void removeTrailingPathSlashes(std::string& filename);
@@ -544,19 +608,26 @@ protected:
     bool playbackScript();
     bool playbackAddEntriesToTimeline();
     void signalPlaybackFinishedForComponent(RecordedType type);
-    void findFirstCameraKeyframeInTimeline();
+    bool findFirstCameraKeyframeInTimeline();
+    Timestamps generateCurrentTimestamp3(double keyframeTime);
     static void saveStringToFile(const std::string& s, unsigned char* kfBuffer,
         size_t& idx, std::ofstream& file);
     static void saveKeyframeToFileBinary(unsigned char* bufferSource, size_t size,
         std::ofstream& file);
 
-    bool addKeyframe(double timestamp,
+    bool addKeyframe(Timestamps t3stamps,
         interaction::KeyframeNavigator::CameraPose keyframe, int lineNum);
-    bool addKeyframe(double timestamp, datamessagestructures::TimeKeyframe keyframe,
-        int lineNum);
-    bool addKeyframe(double timestamp, std::string scriptToQueue, int lineNum);
-    bool addKeyframeToTimeline(RecordedType type, size_t indexIntoTypeKeyframes,
-        double timestamp, int lineNum);
+    bool addKeyframe(Timestamps t3stamps,
+        datamessagestructures::TimeKeyframe keyframe, int lineNum);
+    bool addKeyframe(Timestamps t3stamps,
+        std::string scriptToQueue, int lineNum);
+    bool addKeyframeToTimeline(std::vector<timelineEntry>& timeline, RecordedType type,
+            size_t indexIntoTypeKeyframes, Timestamps t3stamps, int lineNum);
+
+    void initializePlayback_time(double now);
+    void initializePlayback_modeFlags();
+    bool initializePlayback_timeline();
+    void initializePlayback_triggerStart();
     void moveAheadInTime();
     void lookForNonCameraKeyframesThatHaveComeDue(double currTime);
     void updateCameraWithOrWithoutNewKeyframes(double currTime);
@@ -580,9 +651,14 @@ protected:
         const int lineNum);
     void saveSingleKeyframeScript(datamessagestructures::ScriptMessage& kf,
         Timestamps& times, DataMode mode, std::ofstream& file, unsigned char* buffer);
+    void saveScriptKeyframeToPropertiesBaseline(std::string script);
+    bool isPropertyAllowedForBaseline(const std::string& propString);
     unsigned int findIndexOfLastCameraKeyframeInTimeline();
     bool doesTimelineEntryContainCamera(unsigned int index) const;
     std::vector<std::pair<CallbackHandle, StateChangeCallback>> _stateChangeCallbacks;
+    bool doesStartWithSubstring(const std::string& s, const std::string& matchSubstr);
+    void trimCommandsFromScriptIfFound(std::string& script);
+    void replaceCommandsFromScriptIfFound(std::string& script);
 
     RecordedType getNextKeyframeType();
     RecordedType getPrevKeyframeType();
@@ -600,6 +676,14 @@ protected:
     DataMode readModeFromHeader(std::string filename);
     void readPlaybackHeader_stream(std::stringstream& conversionInStream,
         std::string& version, DataMode& mode);
+    void populateListofLoadedSceneGraphNodes();
+
+    bool checkIfScriptUsesScenegraphNode(std::string s);
+    void checkForScenegraphNodeAccess_Scene(std::string& s, std::string& result);
+    void checkForScenegraphNodeAccess_Nav(std::string& s, std::string& result);
+    bool checkIfInitialFocusNodeIsLoaded(unsigned int firstCamIndex);
+    void eraseSpacesFromString(std::string& s);
+    std::string getNameFromSurroundingQuotes(std::string& s);
 
     static void writeToFileBuffer(unsigned char* buf, size_t& idx, double src);
     static void writeToFileBuffer(unsigned char* buf, size_t& idx, std::vector<char>& cv);
@@ -616,27 +700,78 @@ protected:
     std::string _playbackLineParsing;
     std::ofstream _recordFile;
     int _playbackLineNum = 1;
+    int _recordingEntryNum = 1;
     KeyframeTimeRef _playbackTimeReferenceMode;
     datamessagestructures::CameraKeyframe _prevRecordedCameraKeyframe;
     bool _playbackActive_camera = false;
     bool _playbackActive_time = false;
     bool _playbackActive_script = false;
     bool _hasHitEndOfCameraKeyframes = false;
-    bool _setSimulationTimeWithNextCameraKeyframe = false;
+    bool _playbackPausedWithinDeltaTimePause = false;
+    bool _playbackLoopMode = false;
+    bool _playbackForceSimTimeAtStart = false;
+    double _playbackPauseOffset = 0.0;
+    double _previousTime = 0.0;
 
     bool _saveRenderingDuringPlayback = false;
     double _saveRenderingDeltaTime = 1.0 / 30.0;
     double _saveRenderingCurrentRecordedTime;
+    std::chrono::steady_clock::duration _saveRenderingDeltaTime_interpolation_usec;
+    std::chrono::steady_clock::time_point _saveRenderingCurrentRecordedTime_interpolation;
+    long long _saveRenderingClockInterpolation_countsPerSec;
+    bool _saveRendering_isFirstFrame = true;
 
     unsigned char _keyframeBuffer[_saveBufferMaxSize_bytes];
 
     bool _cleanupNeeded = false;
+    const std::string scriptReturnPrefix = "return ";
 
     std::vector<interaction::KeyframeNavigator::CameraPose> _keyframesCamera;
     std::vector<datamessagestructures::TimeKeyframe> _keyframesTime;
     std::vector<std::string> _keyframesScript;
     std::vector<timelineEntry> _timeline;
 
+    std::vector<std::string> _keyframesSavePropertiesBaseline_scripts;
+    std::vector<timelineEntry> _keyframesSavePropertiesBaseline_timeline;
+    std::vector<std::string> _propertyBaselinesSaved;
+    const std::vector<std::string> _propertyBaselineRejects = {
+        "NavigationHandler.OrbitalNavigator.Anchor",
+        "NavigationHandler.OrbitalNavigator.Aim",
+        "NavigationHandler.OrbitalNavigator.RetargetAnchor",
+        "NavigationHandler.OrbitalNavigator.RetargetAim"
+    };
+    //A script that begins with an exact match of any of the strings contained in
+    // _scriptRejects will not be recorded
+    const std::vector<std::string> _scriptRejects = {
+        "openspace.sessionRecording.enableTakeScreenShotDuringPlayback",
+        "openspace.sessionRecording.startPlayback",
+        "openspace.sessionRecording.stopPlayback",
+        "openspace.sessionRecording.startRecording",
+        "openspace.sessionRecording.stopRecording",
+        "openspace.scriptScheduler.clear"
+    };
+    const std::vector<std::string> _navScriptsUsingNodes = {
+        "RetargetAnchor",
+        "Anchor",
+        "Aim"
+    };
+    //Any script snippet included in this vector will be trimmed from any script
+    // from the script manager, before it is recorded in the session recording file.
+    // The remainder of the script will be retained.
+    const std::vector<std::string> _scriptsToBeTrimmed = {
+        "openspace.sessionRecording.togglePlaybackPause"
+    };
+    //Any script snippet included in this vector will be trimmed from any script
+    // from the script manager, before it is recorded in the session recording file.
+    // The remainder of the script will be retained.
+    const std::vector<ScriptSubstringReplace> _scriptsToBeReplaced = {
+        {
+            "openspace.time.pauseToggleViaKeyboard",
+            "openspace.time.interpolateTogglePause"
+        }
+    };
+    std::vector<std::string> _loadedNodes;
+
     unsigned int _idxTimeline_nonCamera = 0;
     unsigned int _idxTime = 0;
     unsigned int _idxScript = 0;
diff --git a/include/openspace/interaction/tasks/convertrecfileversiontask.h b/include/openspace/interaction/tasks/convertrecfileversiontask.h
index a707146095..8c25c18990 100644
--- a/include/openspace/interaction/tasks/convertrecfileversiontask.h
+++ b/include/openspace/interaction/tasks/convertrecfileversiontask.h
@@ -29,11 +29,9 @@
 #include <openspace/interaction/sessionrecording.h>
 
 #include <ghoul/glm.h>
-
+#include <filesystem>
 #include <string>
 
-
-
 namespace openspace::interaction {
 
 class ConvertRecFileVersionTask : public Task {
@@ -48,7 +46,7 @@ public:
 
 private:
     std::string _inFilename;
-    std::string _inFilePath;
+    std::filesystem::path _inFilePath;
     std::string _valueFunctionLua;
 };
 
diff --git a/include/openspace/interaction/tasks/convertrecformattask.h b/include/openspace/interaction/tasks/convertrecformattask.h
index 9258d70406..989dd0bd6c 100644
--- a/include/openspace/interaction/tasks/convertrecformattask.h
+++ b/include/openspace/interaction/tasks/convertrecformattask.h
@@ -29,7 +29,7 @@
 #include <openspace/interaction/sessionrecording.h>
 
 #include <ghoul/glm.h>
-
+#include <filesystem>
 #include <string>
 
 namespace openspace::interaction {
@@ -52,8 +52,8 @@ private:
     void convertToBinary();
     void determineFormatType();
     std::string addFileSuffix(const std::string& filePath, const std::string& suffix);
-    std::string _inFilePath;
-    std::string  _outFilePath;
+    std::filesystem::path _inFilePath;
+    std::filesystem::path _outFilePath;
     std::ifstream _iFile;
     std::ofstream _oFile;
     SessionRecording::DataMode _fileFormatType;
diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h
index f9e7492ebf..effe727cbe 100644
--- a/include/openspace/network/messagestructures.h
+++ b/include/openspace/network/messagestructures.h
@@ -49,6 +49,14 @@ struct CameraKeyframe {
     CameraKeyframe(const std::vector<char>& buffer) {
         deserialize(buffer);
     }
+    CameraKeyframe(glm::dvec3&& pos, glm::dquat&& rot, std::string&& focusNode,
+        bool&& followNodeRot, float&& scale)
+        : _position(pos)
+        , _rotation(rot)
+        , _followNodeRotation(followNodeRot)
+        , _focusNode(focusNode)
+        , _scale(scale)
+    {}
 
     glm::dvec3 _position = glm::dvec3(0.0);
     glm::dquat _rotation = glm::dquat(1.0, 0.0, 0.0, 0.0);
diff --git a/include/openspace/properties/list/doublelistproperty.h b/include/openspace/properties/list/doublelistproperty.h
index b857dbc144..2d5bbdf40a 100644
--- a/include/openspace/properties/list/doublelistproperty.h
+++ b/include/openspace/properties/list/doublelistproperty.h
@@ -31,35 +31,21 @@ namespace openspace::properties {
 
 class DoubleListProperty : public ListProperty<double> {
 public:
-    DoubleListProperty(Property::PropertyInfo info);
-    DoubleListProperty(Property::PropertyInfo info, std::vector<double> values);
+    DoubleListProperty(Property::PropertyInfo info,
+        std::vector<double> values = std::vector<double>());
+
+    std::string className() const override;
+    int typeLua() const override;
 
     using TemplateProperty<std::vector<double>>::operator std::vector<double>;
     using TemplateProperty<std::vector<double>>::operator=;
+
+protected:
+    std::vector<double> fromLuaConversion(lua_State* state, bool& success) const override;
+    void toLuaConversion(lua_State* state) const override;
+    std::string toStringConversion() const override;
 };
 
-template <>
-std::string PropertyDelegate<TemplateProperty<std::vector<double>>>::className();
-
-template <>
-template <>
-std::vector<double>
-PropertyDelegate<TemplateProperty<std::vector<double>>>::fromLuaValue(
-    lua_State* state, bool& success);
-
-template <>
-template <>
-bool PropertyDelegate<TemplateProperty<std::vector<double>>>::toLuaValue(
-    lua_State* state, const std::vector<double>& value);
-
-template <>
-int PropertyDelegate<TemplateProperty<std::vector<double>>>::typeLua();
-
-template <>
-template <>
-bool PropertyDelegate<TemplateProperty<std::vector<double>>>::toString(
-    std::string& outValue, const std::vector<double>& inValue);
-
 } // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___DOUBLELISTPROPERTY___H__
diff --git a/include/openspace/properties/list/intlistproperty.h b/include/openspace/properties/list/intlistproperty.h
index 2213968d0d..0157b4d6af 100644
--- a/include/openspace/properties/list/intlistproperty.h
+++ b/include/openspace/properties/list/intlistproperty.h
@@ -31,34 +31,21 @@ namespace openspace::properties {
 
 class IntListProperty : public ListProperty<int> {
 public:
-    IntListProperty(Property::PropertyInfo info);
-    IntListProperty(Property::PropertyInfo info, std::vector<int> values);
+    IntListProperty(Property::PropertyInfo info,
+        std::vector<int> values = std::vector<int>());
+
+    std::string className() const override;
+    int typeLua() const override;
 
     using TemplateProperty<std::vector<int>>::operator std::vector<int>;
     using TemplateProperty<std::vector<int>>::operator=;
+
+protected:
+    std::vector<int> fromLuaConversion(lua_State* state, bool& success) const override;
+    void toLuaConversion(lua_State* state) const override;
+    std::string toStringConversion() const override;
 };
 
-template <>
-std::string PropertyDelegate<TemplateProperty<std::vector<int>>>::className();
-
-template <>
-template <>
-std::vector<int> PropertyDelegate<TemplateProperty<std::vector<int>>>::fromLuaValue(
-    lua_State* state, bool& success);
-
-template <>
-template <>
-bool PropertyDelegate<TemplateProperty<std::vector<int>>>::toLuaValue(
-    lua_State* state, const std::vector<int>& value);
-
-template <>
-int PropertyDelegate<TemplateProperty<std::vector<int>>>::typeLua();
-
-template <>
-template <>
-bool PropertyDelegate<TemplateProperty<std::vector<int>>>::toString(
-    std::string& outValue, const std::vector<int>& inValue);
-
 } // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___INTLISTPROPERTY___H__
diff --git a/include/openspace/properties/list/stringlistproperty.h b/include/openspace/properties/list/stringlistproperty.h
index 8ed0259332..1d8dfc25ac 100644
--- a/include/openspace/properties/list/stringlistproperty.h
+++ b/include/openspace/properties/list/stringlistproperty.h
@@ -32,35 +32,22 @@ namespace openspace::properties {
 
 class StringListProperty : public ListProperty<std::string> {
 public:
-    StringListProperty(Property::PropertyInfo info);
-    StringListProperty(Property::PropertyInfo info, std::vector<std::string> values);
+    StringListProperty(Property::PropertyInfo info,
+        std::vector<std::string> values = std::vector<std::string>());
+
+    std::string className() const override;
+    int typeLua() const override;
 
     using TemplateProperty<std::vector<std::string>>::operator std::vector<std::string>;
     using TemplateProperty<std::vector<std::string>>::operator=;
+
+protected:
+    std::vector<std::string> fromLuaConversion(lua_State* state,
+        bool& success) const override;
+    void toLuaConversion(lua_State* state) const override;
+    std::string toStringConversion() const override;
 };
 
-template <>
-std::string PropertyDelegate<TemplateProperty<std::vector<std::string>>>::className();
-
-template <>
-template <>
-std::vector<std::string>
-PropertyDelegate<TemplateProperty<std::vector<std::string>>>::fromLuaValue(
-    lua_State* state, bool& success);
-
-template <>
-template <>
-bool PropertyDelegate<TemplateProperty<std::vector<std::string>>>::toLuaValue(
-    lua_State* state, const std::vector<std::string>& value);
-
-template <>
-int PropertyDelegate<TemplateProperty<std::vector<std::string>>>::typeLua();
-
-template <>
-template <>
-bool PropertyDelegate<TemplateProperty<std::vector<std::string>>>::toString(
-    std::string& outValue, const std::vector<std::string>& inValue);
-
 } // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___STRINGLISTPROPERTY___H__
diff --git a/include/openspace/properties/listproperty.h b/include/openspace/properties/listproperty.h
index 9d7ef0f820..2e40db8f05 100644
--- a/include/openspace/properties/listproperty.h
+++ b/include/openspace/properties/listproperty.h
@@ -33,7 +33,6 @@ namespace openspace::properties {
 template <typename T>
 class ListProperty : public TemplateProperty<std::vector<T>> {
 public:
-    ListProperty(Property::PropertyInfo info);
     ListProperty(Property::PropertyInfo info, std::vector<T> values);
 
     virtual ~ListProperty() = 0;
diff --git a/include/openspace/properties/listproperty.inl b/include/openspace/properties/listproperty.inl
index 6bad6b2c09..72158233bb 100644
--- a/include/openspace/properties/listproperty.inl
+++ b/include/openspace/properties/listproperty.inl
@@ -24,11 +24,6 @@
 
 namespace openspace::properties {
 
-template <typename T>
-ListProperty<T>::ListProperty(Property::PropertyInfo info)
-    : TemplateProperty<std::vector<T>>(std::move(info))
-{}
-
 template <typename T>
 ListProperty<T>::ListProperty(Property::PropertyInfo info, std::vector<T> values)
     : TemplateProperty<std::vector<T>>(std::move(info), std::move(values))
diff --git a/include/openspace/properties/matrix/dmat2property.h b/include/openspace/properties/matrix/dmat2property.h
index 617e56d186..659c2e98b6 100644
--- a/include/openspace/properties/matrix/dmat2property.h
+++ b/include/openspace/properties/matrix/dmat2property.h
@@ -28,10 +28,27 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(DMat2Property, glm::dmat2x2)
+class DMat2Property : public NumericalProperty<glm::dmat2x2> {
+public:
+    DMat2Property(Property::PropertyInfo info, glm::dmat2x2 value = glm::dmat2x2(0.0),
+        glm::dmat2x2 minValue =
+            ghoul::createFillMat2x2<double>(std::numeric_limits<double>::lowest()),
+        glm::dmat2x2 maxValue =
+            ghoul::createFillMat2x2<double>(std::numeric_limits<double>::max()),
+        glm::dmat2x2 stepValue = ghoul::createFillMat2x2<double>(0.01));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::dmat2x2>::operator=;
+
+protected:
+    glm::dmat2x2 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/matrix/dmat2x3property.h b/include/openspace/properties/matrix/dmat2x3property.h
deleted file mode 100644
index 825d639204..0000000000
--- a/include/openspace/properties/matrix/dmat2x3property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___DMAT2X3PROPERTY___H__
-#define __OPENSPACE_CORE___DMAT2X3PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(DMat2x3Property, glm::dmat2x3)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___DMAT2X3PROPERTY___H__
diff --git a/include/openspace/properties/matrix/dmat2x4property.h b/include/openspace/properties/matrix/dmat2x4property.h
deleted file mode 100644
index ba3898edad..0000000000
--- a/include/openspace/properties/matrix/dmat2x4property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___DMAT2X4PROPERTY___H__
-#define __OPENSPACE_CORE___DMAT2X4PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(DMat2x4Property, glm::dmat2x4)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___DMAT2X4PROPERTY___H__
diff --git a/include/openspace/properties/matrix/dmat3property.h b/include/openspace/properties/matrix/dmat3property.h
index 486e2ad9c3..24bb05e2c9 100644
--- a/include/openspace/properties/matrix/dmat3property.h
+++ b/include/openspace/properties/matrix/dmat3property.h
@@ -28,10 +28,27 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(DMat3Property, glm::dmat3x3)
+class DMat3Property : public NumericalProperty<glm::dmat3x3> {
+public:
+    DMat3Property(Property::PropertyInfo info, glm::dmat3x3 value = glm::dmat3x3(0.0),
+        glm::dmat3x3 minValue =
+            ghoul::createFillMat3x3<double>(std::numeric_limits<double>::lowest()),
+        glm::dmat3x3 maxValue =
+            ghoul::createFillMat3x3<double>(std::numeric_limits<double>::max()),
+        glm::dmat3x3 stepValue = ghoul::createFillMat3x3<double>(0.01));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::dmat3x3>::operator=;
+
+protected:
+    glm::dmat3x3 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/matrix/dmat3x4property.h b/include/openspace/properties/matrix/dmat3x4property.h
deleted file mode 100644
index 87521b8724..0000000000
--- a/include/openspace/properties/matrix/dmat3x4property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___DMAT3X4PROPERTY___H__
-#define __OPENSPACE_CORE___DMAT3X4PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(DMat3x4Property, glm::dmat3x4)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___DMAT3X4PROPERTY___H__
diff --git a/include/openspace/properties/matrix/dmat4property.h b/include/openspace/properties/matrix/dmat4property.h
index 3788742621..a1d1204289 100644
--- a/include/openspace/properties/matrix/dmat4property.h
+++ b/include/openspace/properties/matrix/dmat4property.h
@@ -28,10 +28,27 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(DMat4Property, glm::dmat4x4)
+class DMat4Property : public NumericalProperty<glm::dmat4x4> {
+public:
+    DMat4Property(Property::PropertyInfo info, glm::dmat4x4 value = glm::dmat4x4(0.0),
+        glm::dmat4x4 minValue =
+            ghoul::createFillMat4x4<double>(std::numeric_limits<double>::lowest()),
+        glm::dmat4x4 maxValue =
+            ghoul::createFillMat4x4<double>(std::numeric_limits<double>::max()),
+        glm::dmat4x4 stepValue = ghoul::createFillMat4x4<double>(0.01));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::dmat4x4>::operator=;
+
+protected:
+    glm::dmat4x4 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/matrix/dmat4x2property.h b/include/openspace/properties/matrix/dmat4x2property.h
deleted file mode 100644
index 7205415c08..0000000000
--- a/include/openspace/properties/matrix/dmat4x2property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___DMAT4X2PROPERTY___H__
-#define __OPENSPACE_CORE___DMAT4X2PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(DMat4x2Property, glm::dmat4x2)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___DMAT4X2PROPERTY___H__
diff --git a/include/openspace/properties/matrix/dmat4x3property.h b/include/openspace/properties/matrix/dmat4x3property.h
deleted file mode 100644
index 0e028317b8..0000000000
--- a/include/openspace/properties/matrix/dmat4x3property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___DMAT4X3PROPERTY___H__
-#define __OPENSPACE_CORE___DMAT4X3PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(DMat4x3Property, glm::dmat4x3)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___DMAT4X3PROPERTY___H__
diff --git a/include/openspace/properties/matrix/mat2property.h b/include/openspace/properties/matrix/mat2property.h
index 42fea778cb..1b610b2e61 100644
--- a/include/openspace/properties/matrix/mat2property.h
+++ b/include/openspace/properties/matrix/mat2property.h
@@ -28,10 +28,27 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(Mat2Property, glm::mat2x2)
+class Mat2Property : public NumericalProperty<glm::mat2x2> {
+public:
+    Mat2Property(Property::PropertyInfo info, glm::mat2x2 value = glm::mat2x2(0.f),
+        glm::mat2x2 minValue =
+            ghoul::createFillMat2x2<float>(std::numeric_limits<float>::lowest()),
+        glm::mat2x2 maxValue =
+            ghoul::createFillMat2x2<float>(std::numeric_limits<float>::max()),
+        glm::mat2x2 stepValue = ghoul::createFillMat2x2<float>(0.01f));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::mat2x2>::operator=;
+
+protected:
+    glm::mat2x2 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/matrix/mat2x3property.h b/include/openspace/properties/matrix/mat2x3property.h
deleted file mode 100644
index 4ad90b4c51..0000000000
--- a/include/openspace/properties/matrix/mat2x3property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___MAT2X3PROPERTY___H__
-#define __OPENSPACE_CORE___MAT2X3PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(Mat2x3Property, glm::mat2x3)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___MAT2X3PROPERTY___H__
diff --git a/include/openspace/properties/matrix/mat2x4property.h b/include/openspace/properties/matrix/mat2x4property.h
deleted file mode 100644
index 54508d5535..0000000000
--- a/include/openspace/properties/matrix/mat2x4property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___MAT2X4PROPERTY___H__
-#define __OPENSPACE_CORE___MAT2X4PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(Mat2x4Property, glm::mat2x4)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___MAT2X4PROPERTY___H__
diff --git a/include/openspace/properties/matrix/mat3property.h b/include/openspace/properties/matrix/mat3property.h
index fbbd272390..ee0c2357c9 100644
--- a/include/openspace/properties/matrix/mat3property.h
+++ b/include/openspace/properties/matrix/mat3property.h
@@ -28,10 +28,27 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(Mat3Property, glm::mat3x3)
+class Mat3Property : public NumericalProperty<glm::mat3x3> {
+public:
+    Mat3Property(Property::PropertyInfo info, glm::mat3x3 value = glm::mat3x3(),
+        glm::mat3x3 minValue =
+            ghoul::createFillMat3x3<float>(std::numeric_limits<float>::lowest()),
+        glm::mat3x3 maxValue =
+            ghoul::createFillMat3x3<float>(std::numeric_limits<float>::max()),
+        glm::mat3x3 stepValue = ghoul::createFillMat3x3<float>(0.01f));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::mat3x3>::operator=;
+
+protected:
+    glm::mat3x3 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/matrix/mat3x2property.h b/include/openspace/properties/matrix/mat3x2property.h
deleted file mode 100644
index 42290b8fbd..0000000000
--- a/include/openspace/properties/matrix/mat3x2property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___MAT3X2PROPERTY___H__
-#define __OPENSPACE_CORE___MAT3X2PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(Mat3x2Property, glm::mat3x2)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___MAT3X2PROPERTY___H__
diff --git a/include/openspace/properties/matrix/mat3x4property.h b/include/openspace/properties/matrix/mat3x4property.h
deleted file mode 100644
index ee26c13adf..0000000000
--- a/include/openspace/properties/matrix/mat3x4property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___MAT3X4PROPERTY___H__
-#define __OPENSPACE_CORE___MAT3X4PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(Mat3x4Property, glm::mat3x4)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___MAT3X4PROPERTY___H__
diff --git a/include/openspace/properties/matrix/mat4property.h b/include/openspace/properties/matrix/mat4property.h
index 50ddd70c40..3c64405aa7 100644
--- a/include/openspace/properties/matrix/mat4property.h
+++ b/include/openspace/properties/matrix/mat4property.h
@@ -28,10 +28,27 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(Mat4Property, glm::mat4x4)
+class Mat4Property : public NumericalProperty<glm::mat4x4> {
+public:
+    Mat4Property(Property::PropertyInfo info, glm::mat4x4 value = glm::mat4x4(),
+        glm::mat4x4 minValue =
+            ghoul::createFillMat4x4<float>(std::numeric_limits<float>::lowest()),
+        glm::mat4x4 maxValue =
+            ghoul::createFillMat4x4<float>(std::numeric_limits<float>::max()),
+        glm::mat4x4 stepValue = ghoul::createFillMat4x4<float>(0.01f));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::mat4x4>::operator=;
+
+protected:
+    glm::mat4x4 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/matrix/mat4x2property.h b/include/openspace/properties/matrix/mat4x2property.h
deleted file mode 100644
index a30aec4c13..0000000000
--- a/include/openspace/properties/matrix/mat4x2property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___MAT4X2PROPERTY___H__
-#define __OPENSPACE_CORE___MAT4X2PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(Mat4x2Property, glm::mat4x2)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___MAT4X2PROPERTY___H__
diff --git a/include/openspace/properties/matrix/mat4x3property.h b/include/openspace/properties/matrix/mat4x3property.h
deleted file mode 100644
index fa63aa6c9e..0000000000
--- a/include/openspace/properties/matrix/mat4x3property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___MAT4X3PROPERTY___H__
-#define __OPENSPACE_CORE___MAT4X3PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(Mat4x3Property, glm::mat4x3)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___MAT4X3PROPERTY___H__
diff --git a/include/openspace/properties/numericalproperty.h b/include/openspace/properties/numericalproperty.h
index 05a88a48fb..1a23ca1370 100644
--- a/include/openspace/properties/numericalproperty.h
+++ b/include/openspace/properties/numericalproperty.h
@@ -32,20 +32,11 @@ namespace openspace::properties {
 template <typename T>
 class NumericalProperty : public TemplateProperty<T> {
 public:
-    NumericalProperty(Property::PropertyInfo info);
-    NumericalProperty(Property::PropertyInfo info, T value);
     NumericalProperty(Property::PropertyInfo info, T value, T minimumValue,
-        T maximumValue);
-    NumericalProperty(Property::PropertyInfo info, T value, T minimumValue,
-        T maximumValue, T steppingValue);
-    NumericalProperty(Property::PropertyInfo info, T value, T minimumValue,
-        T maximumValue, T steppingValue, float exponent);
+        T maximumValue, T steppingValue, float exponent = 1.f);
 
-    bool getLuaValue(lua_State* state) const override;
-    bool setLuaValue(lua_State* state) override;
-    int typeLua() const override;
-
-    bool getStringValue(std::string& value) const override;
+    virtual std::string className() const override = 0;
+    virtual int typeLua() const override = 0;
 
     T minValue() const;
     void setMinValue(T value);
@@ -59,8 +50,6 @@ public:
     float exponent() const;
     void setExponent(float exponent);
 
-    virtual std::string className() const override;
-
     std::string jsonValue() const override;
 
     using TemplateProperty<T>::operator=;
@@ -71,13 +60,16 @@ public:
     void interpolateValue(float t,
         ghoul::EasingFunc<float> easingFunc = nullptr) override;
 
-
 protected:
     static const std::string MinimumValueKey;
     static const std::string MaximumValueKey;
     static const std::string SteppingValueKey;
     static const std::string ExponentValueKey;
 
+    virtual T fromLuaConversion(lua_State* state, bool& success) const override = 0;
+    virtual void toLuaConversion(lua_State* state) const override;
+    virtual std::string toStringConversion() const override;
+
     std::string generateAdditionalJsonDescription() const override;
 
     /**
diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl
index 57913c30de..3f5696f17a 100644
--- a/include/openspace/properties/numericalproperty.inl
+++ b/include/openspace/properties/numericalproperty.inl
@@ -22,175 +22,13 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+#include <openspace/util/json_helper.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <glm/ext/matrix_common.hpp>
+#include <cmath>
 
 namespace openspace::properties {
 
-#define REGISTER_NUMERICALPROPERTY_HEADER(CLASS_NAME, TYPE)                              \
-    using CLASS_NAME = NumericalProperty<TYPE>;                                          \
-                                                                                         \
-    template <>                                                                          \
-    std::string PropertyDelegate<NumericalProperty<TYPE>>::className();                  \
-                                                                                         \
-    template <>                                                                          \
-    std::string PropertyDelegate<TemplateProperty<TYPE>>::className();                   \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<NumericalProperty<TYPE>>::defaultValue<TYPE>();                \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<NumericalProperty<TYPE>>::defaultMinimumValue<TYPE>();         \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<NumericalProperty<TYPE>>::defaultMaximumValue<TYPE>();         \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<NumericalProperty<TYPE>>::defaultSteppingValue<TYPE>();        \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<TemplateProperty<TYPE>>::fromLuaValue(lua_State* state,        \
-                                                                bool& success);          \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<NumericalProperty<TYPE>>::fromLuaValue(lua_State* state,       \
-                                                                 bool& success);         \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<TemplateProperty<TYPE>>::toLuaValue(lua_State* state,          \
-                                                              const TYPE& value);        \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<NumericalProperty<TYPE>>::toLuaValue(lua_State* state,         \
-                                                               const TYPE& value);       \
-    template <>                                                                          \
-    int PropertyDelegate<TemplateProperty<TYPE>>::typeLua();                             \
-    template <>                                                                          \
-    int PropertyDelegate<NumericalProperty<TYPE>>::typeLua();                            \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<TemplateProperty<TYPE>>::toString(std::string& outValue,       \
-                                                            const TYPE& inValue);        \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<NumericalProperty<TYPE>>::toString(std::string& outValue,      \
-                                                            const TYPE& inValue);
-
-
-#define REGISTER_NUMERICALPROPERTY_SOURCE(CLASS_NAME, TYPE, DEFAULT_VALUE,               \
-                                          DEFAULT_MIN_VALUE, DEFAULT_MAX_VALUE,          \
-                                          DEFAULT_STEPPING, FROM_LUA_LAMBDA_EXPRESSION,  \
-                                          TO_LUA_LAMBDA_EXPRESSION,                      \
-                                          TO_STRING_LAMBDA_EXPRESSION, LUA_TYPE)         \
-    template <>                                                                          \
-    std::string PropertyDelegate<TemplateProperty<TYPE>>::className()                    \
-    {                                                                                    \
-        return #CLASS_NAME;                                                              \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    std::string PropertyDelegate<NumericalProperty<TYPE>>::className()                   \
-    {                                                                                    \
-        return PropertyDelegate<TemplateProperty<TYPE>>::className();                    \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<NumericalProperty<TYPE>>::defaultValue<TYPE>()                 \
-    {                                                                                    \
-        return DEFAULT_VALUE;                                                            \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<NumericalProperty<TYPE>>::defaultMinimumValue<TYPE>()          \
-    {                                                                                    \
-        return DEFAULT_MIN_VALUE;                                                        \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<NumericalProperty<TYPE>>::defaultMaximumValue<TYPE>()          \
-    {                                                                                    \
-        return DEFAULT_MAX_VALUE;                                                        \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<NumericalProperty<TYPE>>::defaultSteppingValue<TYPE>()         \
-    {                                                                                    \
-        return DEFAULT_STEPPING;                                                         \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<TemplateProperty<TYPE>>::fromLuaValue<TYPE>(lua_State* state,  \
-                                                                      bool& success)     \
-    {                                                                                    \
-        return FROM_LUA_LAMBDA_EXPRESSION(state, success);                               \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<NumericalProperty<TYPE>>::fromLuaValue<TYPE>(lua_State* state, \
-                                                                       bool& success)    \
-    {                                                                                    \
-        return PropertyDelegate<TemplateProperty<TYPE>>::fromLuaValue<TYPE>(             \
-          state, success);                                                               \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<TemplateProperty<TYPE>>::toLuaValue<TYPE>(lua_State* state,    \
-                                                                    const TYPE& value)   \
-    {                                                                                    \
-        return TO_LUA_LAMBDA_EXPRESSION(state, value);                                   \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<NumericalProperty<TYPE>>::toLuaValue<TYPE>(lua_State* state,   \
-                                                                     const TYPE& value)  \
-    {                                                                                    \
-        return PropertyDelegate<TemplateProperty<TYPE>>::toLuaValue<TYPE>(state, value); \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    int PropertyDelegate<TemplateProperty<TYPE>>::typeLua()                              \
-    {                                                                                    \
-        return LUA_TYPE;                                                                 \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    int PropertyDelegate<NumericalProperty<TYPE>>::typeLua()                             \
-    {                                                                                    \
-        return PropertyDelegate<TemplateProperty<TYPE>>::typeLua();                      \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<TemplateProperty<TYPE>>::toString(std::string& outValue,       \
-                                                            const TYPE& inValue)         \
-    {                                                                                    \
-        return TO_STRING_LAMBDA_EXPRESSION(outValue, inValue);                           \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<NumericalProperty<TYPE>>::toString(std::string& outValue,      \
-                                                             const TYPE& inValue)        \
-    {                                                                                    \
-        return PropertyDelegate<TemplateProperty<TYPE>>::toString(outValue, inValue);    \
-    }
-
-
 template <typename T>
 const std::string NumericalProperty<T>::MinimumValueKey = "MinimumValue";
 
@@ -203,60 +41,6 @@ const std::string NumericalProperty<T>::SteppingValueKey = "SteppingValue";
 template <typename T>
 const std::string NumericalProperty<T>::ExponentValueKey = "Exponent";
 
-// Delegating constructors are necessary; automatic template deduction cannot
-// deduce template argument for 'U' if 'default' methods are used as default values in
-// a single constructor
-
-template <typename T>
-NumericalProperty<T>::NumericalProperty(Property::PropertyInfo info)
-    : NumericalProperty<T>(
-        std::move(info),
-        PropertyDelegate<NumericalProperty<T>>::template defaultValue<T>(),
-        PropertyDelegate<NumericalProperty<T>>::template defaultMinimumValue<T>(),
-        PropertyDelegate<NumericalProperty<T>>::template defaultMaximumValue<T>(),
-        PropertyDelegate<NumericalProperty<T>>::template defaultSteppingValue<T>(),
-        1.f
-    )
-{}
-
-template <typename T>
-NumericalProperty<T>::NumericalProperty(Property::PropertyInfo info, T value)
-    : NumericalProperty<T>(
-        std::move(info),
-        std::move(value),
-        PropertyDelegate<NumericalProperty<T>>::template defaultMinimumValue<T>(),
-        PropertyDelegate<NumericalProperty<T>>::template defaultMaximumValue<T>(),
-        PropertyDelegate<NumericalProperty<T>>::template defaultSteppingValue<T>(),
-        1.f
-    )
-{}
-
-template <typename T>
-NumericalProperty<T>::NumericalProperty(Property::PropertyInfo info, T value,
-                                        T minimumValue, T maximumValue)
-    : NumericalProperty<T>(
-        std::move(info),
-        std::move(value),
-        std::move(minimumValue),
-        std::move(maximumValue),
-        PropertyDelegate<NumericalProperty<T>>::template defaultSteppingValue<T>(),
-        1.f
-    )
-{}
-
-template <typename T>
-NumericalProperty<T>::NumericalProperty(Property::PropertyInfo info, T value,
-                                        T minimumValue, T maximumValue, T steppingValue)
-    : NumericalProperty<T>(
-        std::move(info),
-        std::move(value),
-        std::move(minimumValue),
-        std::move(maximumValue),
-        std::move(steppingValue),
-        1.f
-    )
-{}
-
 template <typename T>
 NumericalProperty<T>::NumericalProperty(Property::PropertyInfo info, T value,
                                         T minimumValue, T maximumValue, T steppingValue,
@@ -268,44 +52,6 @@ NumericalProperty<T>::NumericalProperty(Property::PropertyInfo info, T value,
     , _exponent(exponent)
 {}
 
-template <typename T>
-std::string NumericalProperty<T>::className() const {
-    return PropertyDelegate<NumericalProperty<T>>::className();
-}
-
-template <typename T>
-bool NumericalProperty<T>::setLuaValue(lua_State* state) {
-    bool success = false;
-    T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-        state, success
-    );
-    if (success) {
-        TemplateProperty<T>::setValue(std::move(value));
-    }
-    return success;
-}
-
-template <typename T>
-bool NumericalProperty<T>::getLuaValue(lua_State* state) const {
-    bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-        state, TemplateProperty<T>::_value
-    );
-    return success;
-}
-
-template <typename T>
-int NumericalProperty<T>::typeLua() const {
-    return PropertyDelegate<NumericalProperty<T>>::typeLua();
-}
-
-template <typename T>
-bool NumericalProperty<T>::getStringValue(std::string& value) const {
-    bool success = PropertyDelegate<NumericalProperty<T>>::template toString<T>(
-        value, TemplateProperty<T>::_value
-    );
-    return success;
-}
-
 template <typename T>
 T NumericalProperty<T>::minValue() const {
     return _minimumValue;
@@ -343,6 +89,7 @@ float NumericalProperty<T>::exponent() const {
 
 template <typename T>
 void NumericalProperty<T>::setExponent(float exponent) {
+    ghoul_assert(std::abs(exponent) > 0.f, "Exponent for property input cannot be zero");
     _exponent = exponent;
 }
 
@@ -374,8 +121,7 @@ std::string NumericalProperty<T>::luaToJson(std::string luaValue) const {
 
 template <typename T>
 std::string NumericalProperty<T>::jsonValue() const {
-    std::string value;
-    getStringValue(value);
+    std::string value = toStringConversion();
     return luaToJson(value);
 }
 
@@ -390,13 +136,10 @@ void NumericalProperty<T>::setInterpolationTarget(std::any value) {
 template <typename T>
 void NumericalProperty<T>::setLuaInterpolationTarget(lua_State* state) {
     bool success = false;
-    T thisValue = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-        state,
-        success
-    );
+    T targetValue = fromLuaConversion(state, success);
     if (success) {
         _interpolationStart = TemplateProperty<T>::_value;
-        _interpolationEnd = std::move(thisValue);
+        _interpolationEnd = std::move(targetValue);
     }
 }
 
@@ -412,4 +155,14 @@ void NumericalProperty<T>::interpolateValue(float t,
     ));
 }
 
+template <typename T>
+void NumericalProperty<T>::toLuaConversion(lua_State* state) const {
+    ghoul::lua::push(state, TemplateProperty<T>::_value);
+}
+
+template <typename T>
+std::string NumericalProperty<T>::toStringConversion() const {
+    return formatJson(TemplateProperty<T>::_value);
+}
+
 } // namespace openspace::properties
diff --git a/include/openspace/properties/property.h b/include/openspace/properties/property.h
index b900cf8335..52de1629f9 100644
--- a/include/openspace/properties/property.h
+++ b/include/openspace/properties/property.h
@@ -381,12 +381,13 @@ public:
 
     /**
     * Default view options that can be used in the Property::setViewOption method. The
-    * values are: Property::ViewOptions::Color = \c Color,
-    * Property::ViewOptions::Logarithmic = \c Logarithmic
+    * values are:
+    * - Property::ViewOptions::Color = \c Color (Intended for Vec3 and Vec4),
+    * - Property::ViewOptions::MinMaxRange = \c MinMaxRange (Intended for Vec2)
     */
     struct ViewOptions {
         static const char* Color;
-        static const char* Logarithmic;
+        static const char* MinMaxRange;
     };
 
     /**
diff --git a/include/openspace/properties/propertydelegate.h b/include/openspace/properties/propertydelegate.h
deleted file mode 100644
index 1a871d7b96..0000000000
--- a/include/openspace/properties/propertydelegate.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___PROPERTYDELEGATE___H__
-#define __OPENSPACE_CORE___PROPERTYDELEGATE___H__
-
-#include <string>
-
-struct lua_State;
-
-namespace openspace::properties {
-
-/**
- * The PropertyDelegate class is used by (among others) the TemplateProperty and the
- * NumericalProperty classes to outsource the definitions of class names, default values,
- * etc. Using the PropertyDelegate, it is possible to create new TemplateProperty types
- * without subclassing the TemplateProperty, but rather creating a specialized instance
- * of PropertyDelegate. See
- * (https://github.com/OpenSpace/OpenSpace/wiki/Concepts-Properties) for more detailed
- * information.
- * \see TemplateProperty
- * \see NumericalProperty
- * \tparam T The full class for which this specialized instance of PropertyDelegate is
- * responsible. For example <code>T = TemplateProperty<std::string></code>.
- */
-template <typename T>
-class PropertyDelegate {
-public:
-    /**
-     * This method returns the class name for the class <code>T</code>. The default
-     * implementation will lead to a compile-time error if the class method is not
-     * specialized.
-     * \return The class name for the class <code>T</code>
-     */
-    static std::string className();
-
-    /**
-     * This method will return the preferred default value for the class <code>T</code>.
-     * The default implementation will lead to a compile-time error if the class method is
-     * not specialized.
-     * \return The default value that the class <code>T</code> should use
-     * \tparam U The type by which the class T is specialized. If
-     * <code>T = TemplateProperty<std::string></code>, then <code>U = std::string</code>
-     */
-    template <typename U>
-    static U defaultValue();
-
-    /**
-     * This method will return the preferred default minimum value for the class
-     * <code>T</code>. The default implementation will lead to a compile-time error if the
-     * class method is not specialized. This method is not used in TemplateProperty, but
-     * only NumericalProperty, so the TemplateProperty does not require this method to be
-     * specialized.
-     * \return The default minimum value that the class <code>T</code> should use
-     * \tparam U The type by which the class T is specialized. If
-     * <code>T = NumericalProperty<int></code>, then <code>U = int</code>
-     */
-    template <typename U>
-    static U defaultMinimumValue();
-
-    /**
-     * This method will return the preferred default maximum value for the class
-     * <code>T</code>. The default implementation will lead to a compile-time error if the
-     * class method is not specialized. This method is not used in TemplateProperty, but
-     * only NumericalProperty, so the TemplateProperty does not require this method to be
-     * specialized.
-     * \return The default maximum value that the class <code>T</code> should use
-     * \tparam U The type by which the class T is specialized. If
-     * <code>T = NumericalProperty<int></code>, then <code>U = int</code>
-     */
-    template <typename U>
-    static U defaultMaximumValue();
-
-    /**
-     * The method returns the default stepping value for the class <code>T</code> used in
-     * GUI elements. The default implementation will lead to a compile-time error if the
-     * class method is not specialized. This method is not used in TemplateProperty, but
-     * only NumericalProperty, so the TemplateProperty does not require this method to be
-     * specialized.
-     * \return The default stepping that the class <code>T</code> should use
-     * \tparam U The type by which the class T is specialized. If
-     * <code>T = NumericalProperty<int></code>, then <code>U = int</code>
-     */
-    template <typename U>
-    static U defaultSteppingValue();
-
-    /**
-     * This method converts the top value from the Lua stack into a value of type
-     * <code>U</code> and reports the <code>success</code> back to the caller. The default
-     * implementation will lead to a compile-time error if the class method is not
-     * specialized.
-     * \param state The Lua state from which the value is retrieved
-     * \param success Will be <code>true</code> if the conversion succeeded;
-     * <code>false</code> otherwise
-     * \return The value that was created by converting the top value from the stack
-     * \tparam U The type by which the class T is specialized. If
-     * <code>T = TemplateProperty<std::string></code>, then <code>U = std::string</code>
-     */
-    template <typename U>
-    static U fromLuaValue(lua_State* state, bool& success);
-
-    /**
-     * This method converts the passed <code>value</code>, encodes it and places it on the
-     * top value of the Lua stack and returns the success back to the caller. The default
-     * implementation will lead to a compile-time error if the class method is not
-     * specialized.
-     * \param state The Lua state from which the value is retrieved
-     * \param value The value that will be converted into a Lua object
-     * \return <code>true</code> if the conversion succeeded; <code>false</code> otherwise
-     * \tparam U The type by which the class T is specialized. If
-     * <code>T = TemplateProperty<std::string></code>, then <code>U = std::string</code>
-     */
-    template <typename U>
-    static bool toLuaValue(lua_State* state, const U& value);
-
-    /**
-     * Returns the Lua type that will be put onto the stack in the
-     * PropertyDelegate::toLuaValue method and which will be consumed by the
-     * PropertyDelegate::fromLuaValue method. The returned value can belong to the set of
-     * Lua types: <code>LUA_TNONE</code>, <code>LUA_TNIL</code>,
-     * <code>LUA_TBOOLEAN</code>, <code>LUA_TLIGHTUSERDATA</code>,
-     * <code>LUA_TNUMBER</code>, <code>LUA_TSTRING</code>, <code>LUA_TTABLE</code>,
-     * <code>LUA_TFUNCTION</code>, <code>LUA_TUSERDATA</code>, or
-     * <code>LUA_TTHREAD</code>. The default implementation will return
-     * <code>LUA_TNONE</code>. The default implementation will lead to a compile-time
-     * error if the class method is not specialized.
-     * \return The Lua type that will be consumed or produced by the
-     * PropertyDelegate::toLuaValue and PropertyDelegate::fromLuaValue methods.
-     */
-    static int typeLua();
-
-    template <typename U>
-    static bool toString(std::string& outValue, const U& inValue);
-};
-
-} // namespace openspace::properties
-
-#include <openspace/properties/propertydelegate.inl>
-
-#endif // __OPENSPACE_CORE___PROPERTYDELEGATE___H__
diff --git a/include/openspace/properties/scalar/boolproperty.h b/include/openspace/properties/scalar/boolproperty.h
index 71932957a0..56f08af1d3 100644
--- a/include/openspace/properties/scalar/boolproperty.h
+++ b/include/openspace/properties/scalar/boolproperty.h
@@ -44,7 +44,20 @@
 
 namespace openspace::properties {
 
-REGISTER_TEMPLATEPROPERTY_HEADER(BoolProperty, bool)
+class BoolProperty : public TemplateProperty<bool> {
+public:
+    BoolProperty(Property::PropertyInfo info, bool value = false);
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<bool>::operator=;
+
+protected:
+    bool fromLuaConversion(lua_State* state, bool& success) const override;
+    void toLuaConversion(lua_State* state) const override;
+    std::string toStringConversion() const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/scalar/charproperty.h b/include/openspace/properties/scalar/charproperty.h
deleted file mode 100644
index bce7e2b672..0000000000
--- a/include/openspace/properties/scalar/charproperty.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___CHARPROPERTY___H__
-#define __OPENSPACE_CORE___CHARPROPERTY___H__
-
- /**
- * \file charproperty.h
- *
- * \addtogroup openspace
- * @{
- * \addtogroup properties
- * @{
-
- * \class CharProperty
- * This class is a concrete implementation of openspace::properties::TemplateProperty with
- * the type <code>char</code>.
-
- * @} @}
- */
-
-#include <openspace/properties/numericalproperty.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(CharProperty, char)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___CHARPROPERTY___H__
diff --git a/include/openspace/properties/scalar/doubleproperty.h b/include/openspace/properties/scalar/doubleproperty.h
index f0ad097207..fce130ad3d 100644
--- a/include/openspace/properties/scalar/doubleproperty.h
+++ b/include/openspace/properties/scalar/doubleproperty.h
@@ -41,10 +41,24 @@
  */
 
 #include <openspace/properties/numericalproperty.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(DoubleProperty, double)
+class DoubleProperty : public NumericalProperty<double> {
+public:
+    DoubleProperty(Property::PropertyInfo info, double value = 0.0,
+        double minValue = std::numeric_limits<double>::lowest(),
+        double maxValue = std::numeric_limits<double>::max(), double stepValue = 0.01);
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<double>::operator=;
+
+protected:
+    double fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/scalar/floatproperty.h b/include/openspace/properties/scalar/floatproperty.h
index 5812c05179..2b965fd3a8 100644
--- a/include/openspace/properties/scalar/floatproperty.h
+++ b/include/openspace/properties/scalar/floatproperty.h
@@ -41,10 +41,24 @@
  */
 
 #include <openspace/properties/numericalproperty.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(FloatProperty, float)
+class FloatProperty : public NumericalProperty<float> {
+public:
+    FloatProperty(Property::PropertyInfo info, float value = 0.f,
+        float minValue = std::numeric_limits<float>::lowest(),
+        float maxValue = std::numeric_limits<float>::max(), float stepValue = 0.01f);
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<float>::operator=;
+
+protected:
+    float fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/scalar/intproperty.h b/include/openspace/properties/scalar/intproperty.h
index 06ea74f47d..33d9a66532 100644
--- a/include/openspace/properties/scalar/intproperty.h
+++ b/include/openspace/properties/scalar/intproperty.h
@@ -41,10 +41,24 @@
  */
 
 #include <openspace/properties/numericalproperty.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(IntProperty, int)
+class IntProperty : public NumericalProperty<int> {
+public:
+    IntProperty(Property::PropertyInfo info, int value = 0,
+        int minValue = std::numeric_limits<int>::lowest(),
+        int maxValue = std::numeric_limits<int>::max(), int stepValue = 1);
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<int>::operator=;
+
+protected:
+    int fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/scalar/longdoubleproperty.h b/include/openspace/properties/scalar/longdoubleproperty.h
deleted file mode 100644
index 065c80aff1..0000000000
--- a/include/openspace/properties/scalar/longdoubleproperty.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___LONGDOUBLEPROPERTY___H__
-#define __OPENSPACE_CORE___LONGDOUBLEPROPERTY___H__
-
- /**
- * \file longdoubleproperty.h
- *
- * \addtogroup openspace
- * @{
- * \addtogroup properties
- * @{
-
- * \class LongDoubleProperty
- * This class is a concrete implementation of openspace::properties::TemplateProperty with
- * the type <code>long double</code>.
-
- * @} @}
- */
-
-#include <openspace/properties/numericalproperty.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(LongDoubleProperty, long double)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___LONGDOUBLEPROPERTY___H__
diff --git a/include/openspace/properties/scalar/longlongproperty.h b/include/openspace/properties/scalar/longlongproperty.h
deleted file mode 100644
index f754ee2a33..0000000000
--- a/include/openspace/properties/scalar/longlongproperty.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___LONGLONGPROPERTY___H__
-#define __OPENSPACE_CORE___LONGLONGPROPERTY___H__
-
- /**
- * \file longlongproperty.h
- *
- * \addtogroup openspace
- * @{
- * \addtogroup properties
- * @{
-
- * \class LongLongProperty
- * This class is a concrete implementation of openspace::properties::TemplateProperty with
- * the type <code>long long</code>.
-
- * @} @}
- */
-
-#include <openspace/properties/numericalproperty.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(LongLongProperty, long long)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___LONGLONGPROPERTY___H__
diff --git a/include/openspace/properties/scalar/longproperty.h b/include/openspace/properties/scalar/longproperty.h
index b77efc39ea..80d8b3cfec 100644
--- a/include/openspace/properties/scalar/longproperty.h
+++ b/include/openspace/properties/scalar/longproperty.h
@@ -41,10 +41,25 @@
  */
 
 #include <openspace/properties/numericalproperty.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(LongProperty, long)
+class LongProperty : public NumericalProperty<long> {
+public:
+    LongProperty(Property::PropertyInfo info, long value = long(0),
+        long minValue = std::numeric_limits<long>::lowest(),
+        long maxValue = std::numeric_limits<long>::max(),
+        long stepValue = long(1));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<long>::operator=;
+
+protected:
+    long fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/scalar/shortproperty.h b/include/openspace/properties/scalar/shortproperty.h
index 3bd3c5af9b..1848ad23fe 100644
--- a/include/openspace/properties/scalar/shortproperty.h
+++ b/include/openspace/properties/scalar/shortproperty.h
@@ -41,10 +41,25 @@
  */
 
 #include <openspace/properties/numericalproperty.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(ShortProperty, short)
+class ShortProperty : public NumericalProperty<short> {
+public:
+    ShortProperty(Property::PropertyInfo info, short value = short(0),
+        short minValue = std::numeric_limits<short>::lowest(),
+        short maxValue = std::numeric_limits<short>::max(),
+        short stepValue = short(1));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<short>::operator=;
+
+protected:
+    short fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/scalar/signedcharproperty.h b/include/openspace/properties/scalar/signedcharproperty.h
deleted file mode 100644
index 6f177f1219..0000000000
--- a/include/openspace/properties/scalar/signedcharproperty.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___SIGNEDCHARPROPERTY___H__
-#define __OPENSPACE_CORE___SIGNEDCHARPROPERTY___H__
-
- /**
- * \file signedcharproperty.h
- *
- * \addtogroup openspace
- * @{
- * \addtogroup properties
- * @{
-
- * \class SignedCharProperty
- * This class is a concrete implementation of openspace::properties::TemplateProperty with
- * the type <code>signed char</code>.
-
- * @} @}
- */
-
-#include <openspace/properties/numericalproperty.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(SignedCharProperty, signed char)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___SIGNEDCHARPROPERTY___H__
diff --git a/include/openspace/properties/scalar/ucharproperty.h b/include/openspace/properties/scalar/ucharproperty.h
deleted file mode 100644
index 0e35a5c482..0000000000
--- a/include/openspace/properties/scalar/ucharproperty.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___UCHARPROPERTY___H__
-#define __OPENSPACE_CORE___UCHARPROPERTY___H__
-
- /**
- * \file ucharproperty.h
- *
- * \addtogroup openspace
- * @{
- * \addtogroup properties
- * @{
-
- * \class UCharProperty
- * This class is a concrete implementation of openspace::properties::TemplateProperty with
- * the type <code>unsigned char</code>.
-
- * @} @}
- */
-
-#include <openspace/properties/numericalproperty.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(UCharProperty, unsigned char)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___UCHARPROPERTY___H__
diff --git a/include/openspace/properties/scalar/uintproperty.h b/include/openspace/properties/scalar/uintproperty.h
index dcbc60ee57..e3fe6fefdb 100644
--- a/include/openspace/properties/scalar/uintproperty.h
+++ b/include/openspace/properties/scalar/uintproperty.h
@@ -41,10 +41,25 @@
  */
 
 #include <openspace/properties/numericalproperty.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(UIntProperty, unsigned int)
+class UIntProperty : public NumericalProperty<unsigned int> {
+public:
+    UIntProperty(Property::PropertyInfo info, unsigned int value = 0,
+        unsigned int minValue = std::numeric_limits<unsigned int>::lowest(),
+        unsigned int maxValue = std::numeric_limits<unsigned int>::max(),
+        unsigned int stepValue = 1);
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<unsigned int>::operator=;
+
+protected:
+    unsigned int fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/scalar/ulonglongproperty.h b/include/openspace/properties/scalar/ulonglongproperty.h
deleted file mode 100644
index 2adc241bd4..0000000000
--- a/include/openspace/properties/scalar/ulonglongproperty.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___ULONGLONGPROPERTY___H__
-#define __OPENSPACE_CORE___ULONGLONGPROPERTY___H__
-
- /**
- * \file ulonglongproperty.h
- *
- * \addtogroup openspace
- * @{
- * \addtogroup properties
- * @{
-
- * \class ULongLongProperty
- * This class is a concrete implementation of openspace::properties::TemplateProperty with
- * the type <code>unsigned long long</code>.
-
- * @} @}
- */
-
-#include <openspace/properties/numericalproperty.h>
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_HEADER(ULongLongProperty, unsigned long long)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___ULONGLONGPROPERTY___H__
diff --git a/include/openspace/properties/scalar/ulongproperty.h b/include/openspace/properties/scalar/ulongproperty.h
index 862cce3e69..8df652485c 100644
--- a/include/openspace/properties/scalar/ulongproperty.h
+++ b/include/openspace/properties/scalar/ulongproperty.h
@@ -41,10 +41,25 @@
  */
 
 #include <openspace/properties/numericalproperty.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(ULongProperty, unsigned long)
+class ULongProperty : public NumericalProperty<unsigned long> {
+public:
+    ULongProperty(Property::PropertyInfo info, unsigned long value = 0ul,
+        unsigned long minValue = std::numeric_limits<unsigned long>::lowest(),
+        unsigned long maxValue = std::numeric_limits<unsigned long>::max(),
+        unsigned long stepValue = 1ul);
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<unsigned long>::operator=;
+
+protected:
+    unsigned long fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/scalar/ushortproperty.h b/include/openspace/properties/scalar/ushortproperty.h
index 5a166ddd98..700b1be5ab 100644
--- a/include/openspace/properties/scalar/ushortproperty.h
+++ b/include/openspace/properties/scalar/ushortproperty.h
@@ -41,10 +41,25 @@
  */
 
 #include <openspace/properties/numericalproperty.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(UShortProperty, unsigned short)
+class UShortProperty : public NumericalProperty<unsigned short> {
+public:
+    UShortProperty(Property::PropertyInfo info, unsigned short value = 0,
+        unsigned short minValue = std::numeric_limits<unsigned short>::lowest(),
+        unsigned short maxValue = std::numeric_limits<unsigned short>::max(),
+        unsigned short stepValue = 1);
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<unsigned short>::operator=;
+
+protected:
+    unsigned short fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/scalar/wcharproperty.h b/include/openspace/properties/scalar/wcharproperty.h
deleted file mode 100644
index 321067bd84..0000000000
--- a/include/openspace/properties/scalar/wcharproperty.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___WCHARPROPERTY___H__
-#define __OPENSPACE_CORE___WCHARPROPERTY___H__
-
- /**
- * \file wcharproperty.h
- *
- * \addtogroup openspace
- * @{
- * \addtogroup properties
- * @{
-
- * \class WCharProperty
- * This class is a concrete implementation of openspace::properties::TemplateProperty with
- * the type <code>wchar_t</code>.
-
- * @} @}
- */
-
-#include <openspace/properties/numericalproperty.h>
-
-namespace openspace::properties {
-
-//REGISTER_NUMERICALPROPERTY_HEADER(WCharProperty, wchar_t)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___WCHARPROPERTY___H__
diff --git a/include/openspace/properties/selectionproperty.h b/include/openspace/properties/selectionproperty.h
index 9006ecc630..b17f580a52 100644
--- a/include/openspace/properties/selectionproperty.h
+++ b/include/openspace/properties/selectionproperty.h
@@ -37,6 +37,9 @@ class SelectionProperty : public TemplateProperty<std::set<std::string>> {
 public:
     SelectionProperty(Property::PropertyInfo info);
 
+    std::string className() const override;
+    int typeLua() const override;
+
     /**
      * This method sets the stored value to the provided value <code>val</code>.
      * If the value is different, the listeners are notified. It also removes any
@@ -110,6 +113,13 @@ public:
 
     using TemplateProperty<std::set<std::string>>::operator=;
 
+protected:
+    std::set<std::string> fromLuaConversion(lua_State* state, bool& success) const override;
+
+    void toLuaConversion(lua_State* state) const override;
+
+    std::string toStringConversion() const override;
+
 private:
     void sortOptions();
     bool removeInvalidKeys(std::set<std::string>& keys);
@@ -120,28 +130,6 @@ private:
     std::vector<std::string> _options;
 };
 
-template <>
-std::string PropertyDelegate<TemplateProperty<std::set<std::string>>>::className();
-
-template <>
-template <>
-std::set<std::string>
-PropertyDelegate<TemplateProperty<std::set<std::string>>>::fromLuaValue(lua_State* state,
-    bool& success);
-
-template <>
-template <>
-bool PropertyDelegate<TemplateProperty<std::set<std::string>>>::toLuaValue(
-    lua_State* state, const std::set<std::string>& value);
-
-template <>
-int PropertyDelegate<TemplateProperty<std::set<std::string>>>::typeLua();
-
-template <>
-template <>
-bool PropertyDelegate<TemplateProperty<std::set<std::string>>>::toString(
-    std::string& outValue, const std::set<std::string>& inValue);
-
 } // namespace openspace::properties
 
 #endif // __OPENSPACE_CORE___SELECTIONPROPERTY___H__
diff --git a/include/openspace/properties/stringproperty.h b/include/openspace/properties/stringproperty.h
index e869528c5b..d1a7b8dd7b 100644
--- a/include/openspace/properties/stringproperty.h
+++ b/include/openspace/properties/stringproperty.h
@@ -29,7 +29,20 @@
 
 namespace openspace::properties {
 
-REGISTER_TEMPLATEPROPERTY_HEADER(StringProperty, std::string)
+class StringProperty : public TemplateProperty<std::string> {
+public:
+    StringProperty(Property::PropertyInfo info, std::string value = "");
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<std::string>::operator=;
+
+protected:
+    std::string fromLuaConversion(lua_State* state, bool& success) const override;
+    void toLuaConversion(lua_State* state) const override;
+    std::string toStringConversion() const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/templateproperty.h b/include/openspace/properties/templateproperty.h
index 81db5f3bff..a9ccd7a8b7 100644
--- a/include/openspace/properties/templateproperty.h
+++ b/include/openspace/properties/templateproperty.h
@@ -27,12 +27,10 @@
 
 #include <openspace/properties/property.h>
 
-#include <openspace/properties/propertydelegate.h>
-
 namespace openspace::properties {
 
 /**
- * This concrete subclass of Property handles a single parameter value that is of type
+ * This subclass of Property handles a single parameter value that is of type
  * <code>T</code>. It provides all the necessary methods to automatically access the
  * value. One notable instantiation of this class is StringProperty, using
  * <code>T = std::string</code> while NumericalProperty is a templated subclass dealing
@@ -40,16 +38,14 @@ namespace openspace::properties {
  * The accessor operator and assignment operators are overloaded, so that the
  * TemplateProperty can be used just in the same way as a regular member variable. In the
  * case that these cannot not be used inline, the Property::get method will work.
- * The default value for the stored value of this TemplateProperty is retrieved via a call
- * to the PropertyDelegate::defaultValue method, providing the template parameter
- * <code>T</code> as argument. When a new TemplateProperty is required, that method needs
- * to be specialized for the new type or a compile-time error will occur
- * (See https://github.com/OpenSpace/OpenSpace/wiki/Concepts-Properties).
+ *
+ * Each instantiation of this class should provide a constructor that deals with the
+ * default value for that specific type <code>T</code>, so that a property can be
+ * created from just a Property::PropertyInfo object.
  *
  * \tparam T The type of value that is stored in this TemplateProperty
  * \see Property
  * \see NumericalProperty
- * \see PropertyDelegate
  */
 template <typename T>
 class TemplateProperty : public Property {
@@ -67,19 +63,15 @@ public:
      * \pre \p info.identifier must not be empty
      * \pre \p info.guiName must not be empty
      */
-    TemplateProperty(Property::PropertyInfo info,
-        T value = PropertyDelegate<TemplateProperty<T>>::template defaultValue<T>());
+    TemplateProperty(Property::PropertyInfo info, T value);
 
     /**
-     * Returns the class name for this TemplateProperty. The default implementation makes
-     * a call to the PropertyDelegate::className method with the template parameter
-     * <code>T</code> as argument. For this to work, that method needs to be specialized
-     * to return the correct class name for the new template parameter T, or a
-     * compile-time error will occur.
+     * Returns the class name for this TemplateProperty. This method has to be
+     * specialized for each new type.
      *
      * \return The class name for the TemplateProperty
      */
-    virtual std::string className() const override;
+    virtual std::string className() const override = 0;
 
     /**
      * Returns the stored value packed into a ghoul::any object.
@@ -108,41 +100,34 @@ public:
 
     /**
      * This method encodes the stored value into a Lua object and pushes that object onto
-     * the stack. The encoding is performed by calling PropertyDelegate::toLuaValue with
-     * the template parameter <code>T</code> as an argument. This method has to be
-     * specialized for each new type, or a compile-time error will occur.
+     * the stack.
      *
      * \param state The Lua state onto which the encoded object will be pushed
      * \return \c true if the encoding succeeded; \c false otherwise
      */
-    bool getLuaValue(lua_State* state) const override;
+    virtual bool getLuaValue(lua_State* state) const override;
 
     /**
-     * Sets the value of this TemplateProperty by decoding the object at the top of the Lua
-     * stack and, if successful, assigning it using the Property::set method. The decoding
-     * is performed by calling the PropertyDelegate::fromLuaValue with the template
-     * parameter <code>T</code> as argument. If the decoding is successful, the new value
-     * is set, otherwise it remains unchanged.
+     * Sets the value of this TemplateProperty by decoding the object at the top of the
+     * stack and, if successful, assigning it using the Property::set method. If the
+     * decoding is successful, the new value is set, otherwise it remains unchanged.
      *
      * \param state The Lua state from which the value will be decoded
      * \return \c true if the decoding succeeded; \c false otherwise
      */
-    bool setLuaValue(lua_State* state) override;
+    virtual bool setLuaValue(lua_State* state) override;
 
     /// \see Property::typeLua
-    int typeLua() const override;
+    virtual int typeLua() const override = 0;
 
     /**
-     * This method encodes the stored value into a std::string object. The encoding is
-     * performed by calling PropertyDelegate::toStringValue with the template parameter
-     * <code>T</code> as an argument. This method has to be specialized for each new
-     * type, or a compile-time error will occur. The resulting encoding must also be a
-     * valid JSON representation fo the property.
+     * This method encodes the stored value into a std::string object. The resulting
+     * encoding must also be a valid JSON representation fo the property.
      *
      * \param value The string object in which to store the resulting encoding
      * \return \c true if the encoding succeeded; \c false otherwise
      */
-    bool getStringValue(std::string& value) const override;
+    virtual bool getStringValue(std::string& value) const override;
 
     /**
      * Returns the description for this TemplateProperty as a Lua script that returns a
@@ -199,6 +184,33 @@ public:
     T value() const;
 
 protected:
+    /**
+     * Decodes the object at the top of the stack to a value of the type <code>T</code>
+     * and returns it. This method has to be specialized for each new type.
+     *
+     * \param state The Lua state from which the value will be decoded
+     * \param success Set to true \c true if the decoding succeeded; \c false otherwise
+     * \return the decoded value
+     */
+    virtual T fromLuaConversion(lua_State* state, bool& success) const = 0;
+
+    /**
+     * Encodes the stored value into a Lua object and pushes that object onto
+     * the stack. This method has to be specialized for each new type.
+     *
+     * \param state The Lua state onto which the encoded object will be pushed
+     */
+    virtual void toLuaConversion(lua_State* state) const = 0;
+
+    /**
+     * Encodes the stored value into a std::string object, in a format that is a valid
+     * JSON representation of the property. This method has to be specialized for each
+     * new type.
+     *
+     * \return The resulting encoding
+     */
+    virtual std::string toStringConversion() const = 0;
+
     /// The value that this TemplateProperty currently stores
     T _value;
 };
diff --git a/include/openspace/properties/templateproperty.inl b/include/openspace/properties/templateproperty.inl
index 2dc21e7b30..f4508183ea 100644
--- a/include/openspace/properties/templateproperty.inl
+++ b/include/openspace/properties/templateproperty.inl
@@ -24,118 +24,12 @@
 
 namespace openspace::properties {
 
-    // The following macros can be used to quickly generate the necessary PropertyDelegate
-    // specializations required by the TemplateProperty class. Use the
-    // REGISTER_TEMPLATEPROPERTY_HEADER    macro in the header file and the
-    // REGISTER_TEMPLATEPROPERTY_SOURCE macro in the source file of your new
-    // specialization of a TemplateProperty
-
-
-    // CLASS_NAME = The string that the Property::className() should return as well as the
-    //              C++ class name for which a typedef will be created
-    // TYPE       = The template parameter T for which the TemplateProperty is specialized
-#define REGISTER_TEMPLATEPROPERTY_HEADER(CLASS_NAME, TYPE)                               \
-    using CLASS_NAME = TemplateProperty<TYPE>;                                           \
-                                                                                         \
-    template <>                                                                          \
-    std::string PropertyDelegate<TemplateProperty<TYPE>>::className();                   \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<TemplateProperty<TYPE>>::defaultValue<TYPE>();                 \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<TemplateProperty<TYPE>>::fromLuaValue(lua_State* state,        \
-                                                                bool& success);          \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<TemplateProperty<TYPE>>::toLuaValue(lua_State* state,          \
-                                                              const TYPE& value);        \
-                                                                                         \
-    template <>                                                                          \
-    int PropertyDelegate<TemplateProperty<TYPE>>::typeLua();                             \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<TemplateProperty<TYPE>>::toString(std::string& outValue,       \
-                                                            const TYPE& inValue);
-
-
-// CLASS_NAME = The string that the Property::className() should return as well as the
-//              C++ class name for which a typedef will be created
-// TYPE       = The template parameter T for which the TemplateProperty is specialized
-// DEFAULT_VALUE = The value (as type T) which should be used as a default value
-// FROM_LUA_LAMBDA_EXPRESSION = A lambda expression receiving a lua_State* as the first
-//                              parameter, a bool& as the second parameter and returning
-//                                a value T. It is used by the fromLua method of
-//                                TemplateProperty. The lambda expression must extract the
-//                                stored value from the lua_State, return the value and
-//                                report success in the second argument
-// TO_LUA_LAMBDA_EXPRESSION = A lambda expression receiving a lua_State*, a value T and
-//                            returning a bool. The lambda expression must encode the
-//                              value T onto the lua_State stack and return the success
-// LUA_TYPE                 = The Lua type that will be produced/consumed by the previous
-//                            Lambda expressions
-#define REGISTER_TEMPLATEPROPERTY_SOURCE(CLASS_NAME, TYPE, DEFAULT_VALUE,                \
-                                         FROM_LUA_LAMBDA_EXPRESSION,                     \
-                                         TO_LUA_LAMBDA_EXPRESSION,                       \
-                                         TO_STRING_LAMBDA_EXPRESSION, LUA_TYPE)          \
-    template <>                                                                          \
-    std::string PropertyDelegate<TemplateProperty<TYPE>>::className()                    \
-    {                                                                                    \
-        return #CLASS_NAME;                                                              \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<TemplateProperty<TYPE>>::defaultValue<TYPE>()                  \
-    {                                                                                    \
-        return DEFAULT_VALUE;                                                            \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    TYPE PropertyDelegate<TemplateProperty<TYPE>>::fromLuaValue<TYPE>(lua_State* state,  \
-                                                                      bool& success)     \
-    {                                                                                    \
-        return FROM_LUA_LAMBDA_EXPRESSION(state, success);                               \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<TemplateProperty<TYPE>>::toLuaValue<TYPE>(lua_State* state,    \
-                                                                    const TYPE& value)   \
-    {                                                                                    \
-        return TO_LUA_LAMBDA_EXPRESSION(state, value);                                   \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    int PropertyDelegate<TemplateProperty<TYPE>>::typeLua() {                            \
-        return LUA_TYPE;                                                                 \
-    }                                                                                    \
-                                                                                         \
-    template <>                                                                          \
-    template <>                                                                          \
-    bool PropertyDelegate<TemplateProperty<TYPE>>::toString(std::string& outValue,       \
-                                                            const TYPE& inValue)         \
-    {                                                                                    \
-        return TO_STRING_LAMBDA_EXPRESSION(outValue, inValue);                           \
-    }                                                                                    \
-
-
 template <typename T>
 TemplateProperty<T>::TemplateProperty(Property::PropertyInfo info, T value)
     : Property(std::move(info))
     , _value(std::move(value))
 {}
 
-template <typename T>
-std::string TemplateProperty<T>::className() const {
-    return PropertyDelegate<TemplateProperty<T>>::className();
-}
-
 template <typename T>
 TemplateProperty<T>::operator T() {
     return _value;
@@ -190,20 +84,14 @@ const std::type_info& TemplateProperty<T>::type() const {
 
 template <typename T>
 bool TemplateProperty<T>::getLuaValue(lua_State* state) const {
-    bool success = PropertyDelegate<TemplateProperty<T>>::template toLuaValue<T>(
-        state,
-        _value
-    );
-    return success;
+    toLuaConversion(state);
+    return true;
 }
 
 template <typename T>
 bool TemplateProperty<T>::setLuaValue(lua_State* state) {
     bool success = false;
-    T thisValue = PropertyDelegate<TemplateProperty<T>>::template fromLuaValue<T>(
-        state,
-        success
-    );
+    T thisValue = fromLuaConversion(state, success);
     if (success) {
         set(std::any(thisValue));
     }
@@ -211,17 +99,9 @@ bool TemplateProperty<T>::setLuaValue(lua_State* state) {
 }
 
 template <typename T>
-int TemplateProperty<T>::typeLua() const {
-    return PropertyDelegate<TemplateProperty<T>>::typeLua();
-}
-
-template <typename T>
-bool TemplateProperty<T>::getStringValue(std::string& value) const {
-    bool success = PropertyDelegate<TemplateProperty<T>>::template toString<T>(
-        value,
-        _value
-    );
-    return success;
+bool TemplateProperty<T>::getStringValue(std::string& outValue) const {
+    outValue = toStringConversion();
+    return true;
 }
 
 }  // namespace openspace::properties
diff --git a/include/openspace/properties/vector/bvec2property.h b/include/openspace/properties/vector/bvec2property.h
deleted file mode 100644
index d830934a8d..0000000000
--- a/include/openspace/properties/vector/bvec2property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___BVEC2PROPERTY___H__
-#define __OPENSPACE_CORE___BVEC2PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_TEMPLATEPROPERTY_HEADER(BVec2Property, glm::bvec2)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___BVEC2PROPERTY___H__
diff --git a/include/openspace/properties/vector/bvec3property.h b/include/openspace/properties/vector/bvec3property.h
deleted file mode 100644
index e800cd040e..0000000000
--- a/include/openspace/properties/vector/bvec3property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___BVEC3PROPERTY___H__
-#define __OPENSPACE_CORE___BVEC3PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_TEMPLATEPROPERTY_HEADER(BVec3Property, glm::bvec3)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___BVEC3PROPERTY___H__
diff --git a/include/openspace/properties/vector/bvec4property.h b/include/openspace/properties/vector/bvec4property.h
deleted file mode 100644
index 9c007f8f42..0000000000
--- a/include/openspace/properties/vector/bvec4property.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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___BVEC4PROPERTY___H__
-#define __OPENSPACE_CORE___BVEC4PROPERTY___H__
-
-#include <openspace/properties/numericalproperty.h>
-
-#include <ghoul/glm.h>
-
-namespace openspace::properties {
-
-REGISTER_TEMPLATEPROPERTY_HEADER(BVec4Property, glm::bvec4)
-
-} // namespace openspace::properties
-
-#endif // __OPENSPACE_CORE___BVEC4PROPERTY___H__
diff --git a/include/openspace/properties/vector/dvec2property.h b/include/openspace/properties/vector/dvec2property.h
index a6d72d8e48..3234fead9e 100644
--- a/include/openspace/properties/vector/dvec2property.h
+++ b/include/openspace/properties/vector/dvec2property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(DVec2Property, glm::dvec2)
+class DVec2Property : public NumericalProperty<glm::dvec2> {
+public:
+    DVec2Property(Property::PropertyInfo info, glm::dvec2 value = glm::dvec2(0.0),
+        glm::dvec2 minValue = glm::dvec2(std::numeric_limits<double>::lowest()),
+        glm::dvec2 maxValue = glm::dvec2(std::numeric_limits<double>::max()),
+        glm::dvec2 stepValue = glm::dvec2(0.01));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::dvec2>::operator=;
+
+protected:
+    glm::dvec2 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/vector/dvec3property.h b/include/openspace/properties/vector/dvec3property.h
index 782f1c63d2..0def50c6e1 100644
--- a/include/openspace/properties/vector/dvec3property.h
+++ b/include/openspace/properties/vector/dvec3property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(DVec3Property, glm::dvec3)
+class DVec3Property : public NumericalProperty<glm::dvec3> {
+public:
+    DVec3Property(Property::PropertyInfo info, glm::dvec3 value = glm::dvec3(0.0),
+        glm::dvec3 minValue = glm::dvec3(std::numeric_limits<double>::lowest()),
+        glm::dvec3 maxValue = glm::dvec3(std::numeric_limits<double>::max()),
+        glm::dvec3 stepValue = glm::dvec3(0.01));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::dvec3>::operator=;
+
+protected:
+    glm::dvec3 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/vector/dvec4property.h b/include/openspace/properties/vector/dvec4property.h
index e4e85dc79d..42cd570e9e 100644
--- a/include/openspace/properties/vector/dvec4property.h
+++ b/include/openspace/properties/vector/dvec4property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(DVec4Property, glm::dvec4)
+class DVec4Property : public NumericalProperty<glm::dvec4> {
+public:
+    DVec4Property(Property::PropertyInfo info, glm::dvec4 value = glm::dvec4(0.0),
+        glm::dvec4 minValue = glm::dvec4(std::numeric_limits<double>::lowest()),
+        glm::dvec4 maxValue = glm::dvec4(std::numeric_limits<double>::max()),
+        glm::dvec4 stepValue = glm::dvec4(0.01));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::dvec4>::operator=;
+
+protected:
+    glm::dvec4 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/vector/ivec2property.h b/include/openspace/properties/vector/ivec2property.h
index 720afa62e8..b2060baa22 100644
--- a/include/openspace/properties/vector/ivec2property.h
+++ b/include/openspace/properties/vector/ivec2property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(IVec2Property, glm::ivec2)
+class IVec2Property : public NumericalProperty<glm::ivec2> {
+public:
+    IVec2Property(Property::PropertyInfo info, glm::ivec2 value = glm::ivec2(0),
+        glm::ivec2 minValue = glm::ivec2(std::numeric_limits<int>::lowest()),
+        glm::ivec2 maxValue = glm::ivec2(std::numeric_limits<int>::max()),
+        glm::ivec2 stepValue = glm::ivec2(1));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::ivec2>::operator=;
+
+protected:
+    glm::ivec2 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/vector/ivec3property.h b/include/openspace/properties/vector/ivec3property.h
index 0a68a8e7dd..3585592ac0 100644
--- a/include/openspace/properties/vector/ivec3property.h
+++ b/include/openspace/properties/vector/ivec3property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(IVec3Property, glm::ivec3)
+class IVec3Property : public NumericalProperty<glm::ivec3> {
+public:
+    IVec3Property(Property::PropertyInfo info, glm::ivec3 value = glm::ivec3(0),
+        glm::ivec3 minValue = glm::ivec3(std::numeric_limits<int>::lowest()),
+        glm::ivec3 maxValue = glm::ivec3(std::numeric_limits<int>::max()),
+        glm::ivec3 stepValue = glm::ivec3(1));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::ivec3>::operator=;
+
+protected:
+    glm::ivec3 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/vector/ivec4property.h b/include/openspace/properties/vector/ivec4property.h
index 9e076f009d..392c456032 100644
--- a/include/openspace/properties/vector/ivec4property.h
+++ b/include/openspace/properties/vector/ivec4property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(IVec4Property, glm::ivec4)
+class IVec4Property : public NumericalProperty<glm::ivec4> {
+public:
+    IVec4Property(Property::PropertyInfo info, glm::ivec4 value = glm::ivec4(0),
+        glm::ivec4 minValue = glm::ivec4(std::numeric_limits<int>::lowest()),
+        glm::ivec4 maxValue = glm::ivec4(std::numeric_limits<int>::max()),
+        glm::ivec4 stepValue = glm::ivec4(1));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::ivec4>::operator=;
+
+protected:
+    glm::ivec4 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/vector/uvec2property.h b/include/openspace/properties/vector/uvec2property.h
index cd8ee273e6..abcc240a7c 100644
--- a/include/openspace/properties/vector/uvec2property.h
+++ b/include/openspace/properties/vector/uvec2property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(UVec2Property, glm::uvec2)
+class UVec2Property : public NumericalProperty<glm::uvec2> {
+public:
+    UVec2Property(Property::PropertyInfo info, glm::uvec2 value = glm::uvec2(0),
+        glm::uvec2 minValue = glm::uvec2(std::numeric_limits<unsigned int>::lowest()),
+        glm::uvec2 maxValue = glm::uvec2(std::numeric_limits<unsigned int>::max()),
+        glm::uvec2 stepValue = glm::uvec2(1));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::uvec2>::operator=;
+
+protected:
+    glm::uvec2 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/vector/uvec3property.h b/include/openspace/properties/vector/uvec3property.h
index a0cae39791..3f9037d39b 100644
--- a/include/openspace/properties/vector/uvec3property.h
+++ b/include/openspace/properties/vector/uvec3property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(UVec3Property, glm::uvec3)
+class UVec3Property : public NumericalProperty<glm::uvec3> {
+public:
+    UVec3Property(Property::PropertyInfo info, glm::uvec3 value = glm::uvec3(0),
+        glm::uvec3 minValue = glm::uvec3(std::numeric_limits<unsigned int>::lowest()),
+        glm::uvec3 maxValue = glm::uvec3(std::numeric_limits<unsigned int>::max()),
+        glm::uvec3 stepValue = glm::uvec3(1));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::uvec3>::operator=;
+
+protected:
+    glm::uvec3 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/vector/uvec4property.h b/include/openspace/properties/vector/uvec4property.h
index 57111530a4..a83d5e1e4e 100644
--- a/include/openspace/properties/vector/uvec4property.h
+++ b/include/openspace/properties/vector/uvec4property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(UVec4Property, glm::uvec4)
+class UVec4Property : public NumericalProperty<glm::uvec4> {
+public:
+    UVec4Property(Property::PropertyInfo info, glm::uvec4 value = glm::uvec4(0),
+        glm::uvec4 minValue = glm::uvec4(std::numeric_limits<unsigned int>::lowest()),
+        glm::uvec4 maxValue = glm::uvec4(std::numeric_limits<unsigned int>::max()),
+        glm::uvec4 stepValue = glm::uvec4(1));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::uvec4>::operator=;
+
+protected:
+    glm::uvec4 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/vector/vec2property.h b/include/openspace/properties/vector/vec2property.h
index e17bf88f99..f58647c4de 100644
--- a/include/openspace/properties/vector/vec2property.h
+++ b/include/openspace/properties/vector/vec2property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(Vec2Property, glm::vec2)
+class Vec2Property : public NumericalProperty<glm::vec2> {
+public:
+    Vec2Property(Property::PropertyInfo info, glm::vec2 value = glm::vec2(0.f),
+        glm::vec2 minValue = glm::vec2(std::numeric_limits<float>::lowest()),
+        glm::vec2 maxValue = glm::vec2(std::numeric_limits<float>::max()),
+        glm::vec2 stepValue = glm::vec2(0.01f));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::vec2>::operator=;
+
+protected:
+    glm::vec2 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/vector/vec3property.h b/include/openspace/properties/vector/vec3property.h
index 902226eed3..663f61cd86 100644
--- a/include/openspace/properties/vector/vec3property.h
+++ b/include/openspace/properties/vector/vec3property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(Vec3Property, glm::vec3)
+class Vec3Property : public NumericalProperty<glm::vec3> {
+public:
+    Vec3Property(Property::PropertyInfo info, glm::vec3 value = glm::vec3(0.f),
+        glm::vec3 minValue = glm::vec3(std::numeric_limits<float>::lowest()),
+        glm::vec3 maxValue = glm::vec3(std::numeric_limits<float>::max()),
+        glm::vec3 stepValue = glm::vec3(0.01f));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::vec3>::operator=;
+
+protected:
+    glm::vec3 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/properties/vector/vec4property.h b/include/openspace/properties/vector/vec4property.h
index 35b5b4c6a6..ae8e467cfd 100644
--- a/include/openspace/properties/vector/vec4property.h
+++ b/include/openspace/properties/vector/vec4property.h
@@ -28,10 +28,25 @@
 #include <openspace/properties/numericalproperty.h>
 
 #include <ghoul/glm.h>
+#include <limits>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_HEADER(Vec4Property, glm::vec4)
+class Vec4Property : public NumericalProperty<glm::vec4> {
+public:
+    Vec4Property(Property::PropertyInfo info, glm::vec4 value = glm::vec4(0.f),
+        glm::vec4 minValue = glm::vec4(std::numeric_limits<float>::lowest()),
+        glm::vec4 maxValue = glm::vec4(std::numeric_limits<float>::max()),
+        glm::vec4 stepValue = glm::vec4(0.01f));
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<glm::vec4>::operator=;
+
+protected:
+    glm::vec4 fromLuaConversion(lua_State* state, bool& success) const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/include/openspace/rendering/deferredcaster.h b/include/openspace/rendering/deferredcaster.h
index 0f33e1894e..3d9f476848 100644
--- a/include/openspace/rendering/deferredcaster.h
+++ b/include/openspace/rendering/deferredcaster.h
@@ -25,6 +25,7 @@
 #ifndef __OPENSPACE_CORE___DEFERREDCASTER___H
 #define __OPENSPACE_CORE___DEFERREDCASTER___H
 
+#include <filesystem>
 #include <string>
 
 namespace ghoul::opengl {
@@ -46,31 +47,30 @@ public:
         const DeferredcastData& /*deferredData*/,
         ghoul::opengl::ProgramObject& /*program*/) {};
 
-    virtual void postRaycast(const RenderData & /*renderData*/,
+    virtual void postRaycast(const RenderData& /*renderData*/,
         const DeferredcastData& /*deferredData*/,
         ghoul::opengl::ProgramObject& /*program*/) {};
 
-    virtual std::string deferredcastPath() const = 0;
+    virtual std::filesystem::path deferredcastPath() const = 0;
 
-    virtual std::string deferredcastVSPath() const = 0;
+    virtual std::filesystem::path deferredcastVSPath() const = 0;
 
-    virtual std::string deferredcastFSPath() const = 0;
+    virtual std::filesystem::path deferredcastFSPath() const = 0;
 
     virtual void initializeCachedVariables(ghoul::opengl::ProgramObject&) = 0;
 
     virtual void update(const UpdateData&) = 0;
 
     /**
-     * Return a path to a glsl file with helper functions required for the
-     * transformation and raycast steps.
-     * This file will be included once per shader program generated,
-     * regardless of how many volumes say they require the file.
-     * Ideal to avoid redefinitions of helper functions.
+     * Return a path to a GLSL file with helper functions required for the transformation
+     * and raycast steps. This file will be included once per shader program generated,
+     * regardless of how many volumes say they require the file. Ideal to avoid
+     * redefinitions of helper functions.
      *
      * The shader preprocessor will have access to the #{namespace} variable (unique per
      * helper file) which should be a prefix to all symbols defined by the helper
      */
-    virtual std::string helperPath() const = 0;
+    virtual std::filesystem::path helperPath() const = 0;
 };
 
 } // namespace openspace
diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h
index ce4c00fb86..d76c2c5d88 100644
--- a/include/openspace/rendering/framebufferrenderer.h
+++ b/include/openspace/rendering/framebufferrenderer.h
@@ -83,8 +83,10 @@ public:
     void setDisableHDR(bool disable) override;
 
     void update() override;
-    void performRaycasterTasks(const std::vector<RaycasterTask>& tasks);
-    void performDeferredTasks(const std::vector<DeferredcasterTask>& tasks);
+    void performRaycasterTasks(const std::vector<RaycasterTask>& tasks,
+        const glm::ivec4& viewport);
+    void performDeferredTasks(const std::vector<DeferredcasterTask>& tasks,
+        const glm::ivec4& viewport);
     void render(Scene* scene, Camera* camera, float blackoutFactor) override;
 
     /**
@@ -109,11 +111,11 @@ private:
     >;
 
     void resolveMSAA(float blackoutFactor);
-    void applyTMO(float blackoutFactor);
-    void applyFXAA();
+    void applyTMO(float blackoutFactor, const glm::ivec4& viewport);
+    void applyFXAA(const glm::ivec4& viewport);
     void updateDownscaleTextures();
     void updateExitVolumeTextures();
-    void writeDownscaledVolume();
+    void writeDownscaledVolume(const glm::ivec4& viewport);
 
     std::map<VolumeRaycaster*, RaycastData> _raycastData;
     RaycasterProgObjMap _exitPrograms;
@@ -129,10 +131,11 @@ private:
     std::unique_ptr<ghoul::opengl::ProgramObject> _downscaledVolumeProgram;
 
     UniformCache(hdrFeedingTexture, blackoutFactor, hdrExposure, gamma,
-                 Hue, Saturation, Value) _hdrUniformCache;
-    UniformCache(renderedTexture, inverseScreenSize) _fxaaUniformCache;
-    UniformCache(downscaledRenderedVolume, downscaledRenderedVolumeDepth)
-        _writeDownscaledVolumeUniformCache;
+        Hue, Saturation, Value, Viewport, Resolution) _hdrUniformCache;
+    UniformCache(renderedTexture, inverseScreenSize, Viewport,
+        Resolution) _fxaaUniformCache;
+    UniformCache(downscaledRenderedVolume, downscaledRenderedVolumeDepth, viewport,
+        resolution) _writeDownscaledVolumeUniformCache;
 
     GLint _defaultFBO;
     GLuint _screenQuad;
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index f698af2248..cc6698f165 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -34,6 +34,7 @@
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/properties/triggerproperty.h>
 #include <chrono>
+#include <filesystem>
 
 namespace ghoul {
     namespace fontrendering { class Font; }
@@ -109,12 +110,13 @@ public:
     std::vector<ScreenSpaceRenderable*> screenSpaceRenderables() const;
 
     std::unique_ptr<ghoul::opengl::ProgramObject> buildRenderProgram(
-        const std::string& name, const std::string& vsPath, std::string fsPath,
-        ghoul::Dictionary data = ghoul::Dictionary());
+        const std::string& name, const std::filesystem::path& vsPath,
+        std::filesystem::path fsPath, ghoul::Dictionary data = ghoul::Dictionary());
 
     std::unique_ptr<ghoul::opengl::ProgramObject> buildRenderProgram(
-        const std::string& name, const std::string& vsPath, std::string fsPath,
-        const std::string& csPath, ghoul::Dictionary data = ghoul::Dictionary());
+        const std::string& name, const std::filesystem::path& vsPath,
+        std::filesystem::path fsPath, const std::filesystem::path& csPath,
+        ghoul::Dictionary data = ghoul::Dictionary());
 
     void removeRenderProgram(ghoul::opengl::ProgramObject* program);
 
diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 189ae16d12..87154bd7b8 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -104,11 +104,12 @@ protected:
     properties::Vec3Property _localRotation;
 
     properties::FloatProperty _scale;
+    properties::Vec3Property _multiplyColor;
     properties::FloatProperty _opacity;
     properties::TriggerProperty _delete;
 
     glm::ivec2 _objectSize = glm::ivec2(0);
-    UniformCache(alpha, modelTransform, viewProj, texture) _uniformCache;
+    UniformCache(color, opacity, mvp, texture) _uniformCache;
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
 };
 
diff --git a/include/openspace/rendering/texturecomponent.h b/include/openspace/rendering/texturecomponent.h
index 5c4d905a7c..1940e05fac 100644
--- a/include/openspace/rendering/texturecomponent.h
+++ b/include/openspace/rendering/texturecomponent.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_CORE___TEXTURECOMPONENT___H__
 
 #include <ghoul/opengl/texture.h>
+#include <filesystem>
 
 namespace ghoul::filesystem { class File; }
 namespace ghoul::opengl {class Texture; }
@@ -48,7 +49,7 @@ public:
     void uploadToGpu();
 
     // Loads a texture from a file on disk
-    void loadFromFile(const std::string& path);
+    void loadFromFile(const std::filesystem::path& path);
 
     // Function to call in a renderable's update function to make sure
     // the texture is kept up to date
diff --git a/include/openspace/rendering/transferfunction.h b/include/openspace/rendering/transferfunction.h
index cdad470af7..cca8ef5dc0 100644
--- a/include/openspace/rendering/transferfunction.h
+++ b/include/openspace/rendering/transferfunction.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_CORE___TRANSFERFUNCTION___H__
 
 #include <ghoul/glm.h>
+#include <filesystem>
 #include <functional>
 #include <memory>
 #include <string>
@@ -58,7 +59,7 @@ private:
     void setTextureFromImage();
     void uploadTexture();
 
-    std::string _filepath;
+    std::filesystem::path _filepath;
     std::unique_ptr<ghoul::filesystem::File> _file;
     std::shared_ptr<ghoul::opengl::Texture> _texture;
     bool _needsUpdate = false;
diff --git a/include/openspace/scene/assetloader.h b/include/openspace/scene/assetloader.h
index 779e98e892..141dc5aa2c 100644
--- a/include/openspace/scene/assetloader.h
+++ b/include/openspace/scene/assetloader.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_CORE___ASSETLOADER___H__
 
 #include <openspace/scene/asset.h>
+#include <filesystem>
 #include <map>
 #include <memory>
 #include <string>
@@ -169,7 +170,7 @@ private:
     void tearDownAssetLuaTable(Asset* asset);
 
     std::shared_ptr<Asset> getAsset(const std::string& name);
-    ghoul::filesystem::Directory currentDirectory() const;
+    std::filesystem::path currentDirectory() const;
 
     void setCurrentAsset(Asset* asset);
     void addLuaDependencyTable(Asset* dependant, Asset* dependency);
diff --git a/include/openspace/scripting/lualibrary.h b/include/openspace/scripting/lualibrary.h
index 1c123f6014..698da1ca6a 100644
--- a/include/openspace/scripting/lualibrary.h
+++ b/include/openspace/scripting/lualibrary.h
@@ -26,6 +26,7 @@
 #define __OPENSPACE_CORE___LUALIBRARY___H__
 
 #include <ghoul/lua/ghoul_lua.h>
+#include <filesystem>
 #include <string>
 #include <vector>
 
@@ -58,7 +59,7 @@ struct LuaLibrary {
     /// The list of all C-based callback functions for this library
     std::vector<Function> functions;
     /// A list of script files that are executed for each Lua state
-    std::vector<std::string> scripts = std::vector<std::string>();
+    std::vector<std::filesystem::path> scripts = std::vector<std::filesystem::path>();
 
     /// This struct contains information about a function or constant that is defined in
     /// a Lua script
diff --git a/modules/digitaluniverse/shaders/pointssprite_fs.glsl b/include/openspace/util/json_helper.h
similarity index 62%
rename from modules/digitaluniverse/shaders/pointssprite_fs.glsl
rename to include/openspace/util/json_helper.h
index 6a6cfdb647..f5dafffdbc 100644
--- a/modules/digitaluniverse/shaders/pointssprite_fs.glsl
+++ b/include/openspace/util/json_helper.h
@@ -22,32 +22,47 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include "fragment.glsl"
+#ifndef __OPENSPACE_CORE___JSON_HELPER___H__
+#define __OPENSPACE_CORE___JSON_HELPER___H__
 
-in float vs_screenSpaceDepth;
-in vec2 vs_st;
+#include <string>
 
-uniform sampler2D texture1;
-uniform bool additiveBlending;
+namespace openspace {
 
+/**
+ * This function takes a \p text and escapes all necessary characters () that JSON
+ * does not want in its strings.
+ * \param text The text that is to be escaped
+ * \return The same text with all required characteres escaped
+ */
+std::string escapedJson(const std::string& text);
 
-Fragment getFragment() {
-    Fragment frag;
-    if (gl_FrontFacing) {
-        frag.color = texture(texture1, vs_st);
-    }
-    else {
-        frag.color = texture(texture1, vec2(1 - vs_st.s, vs_st.t));
-    }
+/**
+ * This function takes a \p list of text and escapes all necessary characters () that
+ * JSON does not want in its strings.
+ * \param text The list of text that is to be escaped
+ * \return The same text with all required characteres escaped
+ */
+std::string escapedJson(const std::vector<std::string>& list);
 
-    if (frag.color.a == 0.0) {
-        discard;
-    }
+/**
+ * Convert the input value to a valid JSON formatted string. Nan and Inf values
+ * are not vald JSON and will be represented by 'null'
+ * \param d The value to format
+ * \return The resulting JSON formatted string
+ */
+std::string formatJsonNumber(double d);
 
-    frag.depth = vs_screenSpaceDepth;
+/**
+ * Convert the input value to a valid JSON formatted string
+ * \param value The value to be converted
+ * \return The resulting JSON formatted string
+ */
+template <typename T>
+std::string formatJson(T value);
 
-    if (additiveBlending) {
-        frag.blend = BLEND_MODE_ADDITIVE;
-    }
-    return frag;
-}
+} // namespace openspace
+
+#include "json_helper.inl"
+
+#endif // __OPENSPACE_CORE___JSON_HELPER___H__
diff --git a/include/openspace/properties/propertydelegate.inl b/include/openspace/util/json_helper.inl
similarity index 50%
rename from include/openspace/properties/propertydelegate.inl
rename to include/openspace/util/json_helper.inl
index be419421cf..ce0fafec86 100644
--- a/include/openspace/properties/propertydelegate.inl
+++ b/include/openspace/util/json_helper.inl
@@ -22,73 +22,75 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <typeinfo>
+#include <ghoul/fmt.h>
+#include <ghoul/glm.h>
+#include <ghoul/misc/dictionaryjsonformatter.h>
+#include <type_traits>
 
-namespace openspace::properties {
+namespace openspace {
+
+namespace internal {
+
+template <class T, class... Ts>
+struct is_any : std::disjunction<std::is_same<T, Ts>...> {};
 
 template <typename T>
-std::string PropertyDelegate<T>::className() {
-    static_assert(sizeof(T) == 0,
-        "Unimplemented PropertyDelegate::className specialization");
-    return "";
+constexpr bool isGlmMatrix() {
+    return is_any<T,
+        glm::mat2x2, glm::mat2x3, glm::mat2x4,
+        glm::mat3x2, glm::mat3x3, glm::mat3x4,
+        glm::mat4x2, glm::mat4x3, glm::mat4x4,
+        glm::dmat2x2, glm::dmat2x3, glm::dmat2x4,
+        glm::dmat3x2, glm::dmat3x3, glm::dmat3x4,
+        glm::dmat4x2, glm::dmat4x3, glm::dmat4x4>::value;
 }
 
 template <typename T>
-template <typename U>
-U PropertyDelegate<T>::defaultValue() {
-    static_assert(sizeof(T) == 0,
-        "Unimplemented PropertyDelegate::defaultValue specialization");
+constexpr bool isGlmVector() {
+    return is_any<T,
+        glm::vec2, glm::vec3, glm::vec4,
+        glm::ivec2, glm::ivec3, glm::ivec4,
+        glm::dvec2, glm::dvec3, glm::dvec4,
+        glm::uvec2, glm::uvec3, glm::uvec4>::value;
 }
 
+} // namespace internal
+
 template <typename T>
-template <typename U>
-U PropertyDelegate<T>::defaultMinimumValue() {
-    static_assert(sizeof(T) == 0,
-        "Unimplemented PropertyDelegate::defaultMinimumValue specialization");
+std::string formatJson(T value) {
+    if constexpr (std::is_same_v<T, bool>) {
+        return value ? "true" : "false";
+    }
+    else if constexpr (std::is_arithmetic_v<T>) {
+        return formatJsonNumber(static_cast<double>(value));
+    }
+    else if constexpr (std::is_same_v<T, std::string>) {
+        return escapedJson(value);
+    }
+    else if constexpr (std::is_same_v<T, ghoul::Dictionary>) {
+        return ghoul::formatJson(value);
+    }
+    else if constexpr (internal::isGlmVector<T>()) {
+        std::string values;
+        for (glm::length_t i = 0; i < ghoul::glm_components<T>::value; ++i) {
+            values += std::to_string(value[i]) + ',';
+        }
+        values.pop_back();
+        return fmt::format("[{}]", values);
+    }
+    else if constexpr (internal::isGlmMatrix<T>()) {
+        std::string values;
+        for (glm::length_t i = 0; i < T::type::row_type::length(); ++i) {
+            for (glm::length_t j = 0; j < T::type::col_type::length(); ++j) {
+                values += std::to_string(value[i][j]) + ',';
+            }
+        }
+        values.pop_back();
+        return fmt::format("[{}]", values);
+    }
+    else {
+        static_assert(sizeof(T) == 0, "JSON formatting of type T not implemented");
+    }
 }
 
-template <typename T>
-template <typename U>
-U PropertyDelegate<T>::defaultMaximumValue() {
-    static_assert(sizeof(T) == 0,
-        "Unimplemented PropertyDelegate::defaultMaximumValue specialization");
-}
-
-template <typename T>
-template <typename U>
-U PropertyDelegate<T>::defaultSteppingValue() {
-    static_assert(sizeof(T) == 0,
-        "Unimplemented PropertyDelegate::defaultSteppingValue specialization");
-}
-
-template <typename T>
-template <typename U>
-U PropertyDelegate<T>::fromLuaValue(lua_State*, bool&) {
-    static_assert(sizeof(T) == 0,
-        "Unimplemented PropertyDelegate::fromLuaValue specialization");
-}
-
-template <typename T>
-template <typename U>
-bool PropertyDelegate<T>::toLuaValue(lua_State*, const U&) {
-    static_assert(sizeof(T) == 0,
-        "Unimplemented PropertyDelegate::toLuaValue specialization");
-    return false;
-}
-
-template <typename T>
-int PropertyDelegate<T>::typeLua() {
-    static_assert(sizeof(T) == 0,
-        "Unimplemented PropertyDelegate::luaType specialization");
-    return 0;
-}
-
-template <typename T>
-template <typename U>
-bool PropertyDelegate<T>::toString(std::string&, const U&) {
-    static_assert(sizeof(T) == 0,
-        "Unimplemented PropertyDelegate::toString specialization");
-    return false;
-}
-
-} // namespace openspace::properties
+}  // namespace openspace
diff --git a/include/openspace/util/timeline.h b/include/openspace/util/timeline.h
index 1f2936cf40..60e71f25cc 100644
--- a/include/openspace/util/timeline.h
+++ b/include/openspace/util/timeline.h
@@ -47,8 +47,8 @@ struct Keyframe : public KeyframeBase {
     Keyframe(size_t i, double t, T d);
 
     Keyframe(Keyframe const&) = default;
-    Keyframe(Keyframe&&) = default;
-    Keyframe& operator=(Keyframe&&) = default;
+    Keyframe(Keyframe&&) noexcept = default;
+    Keyframe& operator=(Keyframe&&) noexcept = default;
     Keyframe& operator=(Keyframe const&) = default;
     T data;
 };
diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h
index 1e213abb0a..d7500939c6 100644
--- a/include/openspace/util/timemanager.h
+++ b/include/openspace/util/timemanager.h
@@ -40,7 +40,7 @@ namespace openspace {
 
 struct TimeKeyframeData {
     Time time;
-    double delta;
+    double delta = 0.0;
     bool pause = false;
     bool jump = false;
 };
diff --git a/modules/atmosphere/CMakeLists.txt b/modules/atmosphere/CMakeLists.txt
index 475810d9fb..72cd611aa6 100644
--- a/modules/atmosphere/CMakeLists.txt
+++ b/modules/atmosphere/CMakeLists.txt
@@ -40,30 +40,17 @@ set(SHADER_FILES
   shaders/atmosphere_common.glsl
   shaders/atmosphere_deferred_vs.glsl 
   shaders/atmosphere_deferred_fs.glsl
-  shaders/deltaE_calc_vs.glsl
+  shaders/calculation_gs.glsl
+  shaders/calculation_vs.glsl
   shaders/deltaE_calc_fs.glsl
-  shaders/deltaJ_calc_vs.glsl
   shaders/deltaJ_calc_fs.glsl
-  shaders/deltaJ_calc_gs.glsl
-  shaders/deltaS_calc_vs.glsl
-  shaders/deltaS_calc_gs.glsl
   shaders/deltaS_calc_fs.glsl
-  shaders/deltaS_sup_calc_vs.glsl
-  shaders/deltaS_sup_calc_gs.glsl
   shaders/deltaS_sup_calc_fs.glsl
-  shaders/inScattering_calc_vs.glsl
-  shaders/inScattering_calc_gs.glsl
   shaders/inScattering_calc_fs.glsl
-  shaders/inScattering_sup_calc_vs.glsl
-  shaders/inScattering_sup_calc_gs.glsl
   shaders/inScattering_sup_calc_fs.glsl
-  shaders/irradiance_calc_vs.glsl
   shaders/irradiance_calc_fs.glsl
-  shaders/irradiance_final_vs.glsl
   shaders/irradiance_final_fs.glsl
-  shaders/irradiance_sup_calc_vs.glsl
   shaders/irradiance_sup_calc_fs.glsl
-  shaders/transmittance_calc_vs.glsl
   shaders/transmittance_calc_fs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 0a27be4596..b26103a2fd 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -32,118 +32,185 @@
  * Copyright (c) 2008 INRIA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ *    conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *    of conditions and the following disclaimer in the documentation and/or other
+ *    materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without specific
+ *    prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <modules/atmosphere/rendering/atmospheredeferredcaster.h>
 
 #include <openspace/engine/globals.h>
-#include <openspace/rendering/renderable.h>
+#include <openspace/query/query.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/rendering/renderer.h>
-#include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/scene.h>
-#include <openspace/util/updatestructures.h>
 #include <openspace/util/spicemanager.h>
-#include <ghoul/glm.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/profiling.h>
-#include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/openglstatecache.h>
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
-#include <glm/gtx/string_cast.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtx/transform.hpp>
-#include <glm/gtx/vector_angle.hpp>
-#include <glm/gtc/quaternion.hpp>
-#include <sstream>
-#include <fstream>
-
-#ifdef WIN32
-#define _USE_MATH_DEFINES
-#endif // WIN32
 #include <cmath>
-
+#include <fstream>
 
 namespace {
     constexpr const char* _loggerCat = "AtmosphereDeferredcaster";
 
-    constexpr const std::array<const char*, 17> UniformNames1 = {
-        "cullAtmosphere", "Rg", "Rt", "groundRadianceEmittion", "HR", "betaRayleigh",
+    constexpr const std::array<const char*, 27> UniformNames = {
+        "cullAtmosphere", "Rg", "Rt", "groundRadianceEmission", "HR", "betaRayleigh",
         "HM", "betaMieExtinction", "mieG", "sunRadiance", "ozoneLayerEnabled", "HO",
-        "betaOzoneExtinction", "SAMPLES_R", "SAMPLES_MU", "SAMPLES_MU_S", "SAMPLES_NU"
-    };
-
-    constexpr const std::array<const char*, 10> UniformNames2 = {
+        "betaOzoneExtinction", "SAMPLES_R", "SAMPLES_MU", "SAMPLES_MU_S", "SAMPLES_NU",
         "dInverseModelTransformMatrix", "dModelTransformMatrix",
         "dSgctProjectionToModelTransformMatrix", "dSGCTViewToWorldMatrix", "dCamPosObj",
         "sunDirectionObj", "hardShadows", "transmittanceTexture", "irradianceTexture",
         "inscatterTexture"
     };
 
-    constexpr const char* GlslDeferredcastPath =
-        "${MODULES}/atmosphere/shaders/atmosphere_deferred_fs.glsl";
-    constexpr const char* GlslDeferredcastFSPath =
-        "${MODULES}/atmosphere/shaders/atmosphere_deferred_fs.glsl";
-    constexpr const char* GlslDeferredcastVsPath =
-        "${MODULES}/atmosphere/shaders/atmosphere_deferred_vs.glsl";
-
-    constexpr const float ATM_EPS = 2.f;
+    constexpr const float ATM_EPS = 2000.f;
     constexpr const float KM_TO_M = 1000.f;
 
-
     void createRenderQuad(GLuint* vao, GLuint* vbo, GLfloat size) {
         glGenVertexArrays(1, vao);
         glGenBuffers(1, vbo);
         glBindVertexArray(*vao);
         glBindBuffer(GL_ARRAY_BUFFER, *vbo);
 
-        const GLfloat vertex_data[] = {
-            //      x      y     z     w
+        const GLfloat VertexData[] = {
+            //  x      y    z    w
             -size, -size, 0.f, 1.f,
-            size,    size, 0.f, 1.f,
+             size,  size, 0.f, 1.f,
             -size,  size, 0.f, 1.f,
             -size, -size, 0.f, 1.f,
-            size, -size, 0.f, 1.f,
-            size,    size, 0.f, 1.f
+             size, -size, 0.f, 1.f,
+             size,  size, 0.f, 1.f
         };
 
-        glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), vertex_data, GL_STATIC_DRAW);
-        glVertexAttribPointer(
-            0,
-            4,
-            GL_FLOAT,
-            GL_FALSE,
-            sizeof(GLfloat) * 4,
-            nullptr
-        );
+        glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData, GL_STATIC_DRAW);
+        glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr);
         glEnableVertexAttribArray(0);
+        glBindVertexArray(0);
+    }
 
+    void saveTextureFile(GLenum colorBufferAttachment,
+                         const std::filesystem::path& fileName, const glm::ivec2& size)
+    {
+        std::fstream ppmFile;
+        ppmFile.open(fileName, std::fstream::out);
+        if (!ppmFile.is_open()) {
+            return;
+        }
+
+        std::vector<unsigned char> px(
+            size.x * size.y * 3,
+            static_cast<unsigned char>(255)
+        );
+
+        if (colorBufferAttachment != GL_DEPTH_ATTACHMENT) {
+            glReadBuffer(colorBufferAttachment);
+            glReadPixels(0, 0, size.x, size.y, GL_RGB, GL_UNSIGNED_BYTE, px.data());
+        }
+        else {
+            glReadPixels(
+                0,
+                0,
+                size.x,
+                size.y,
+                GL_DEPTH_COMPONENT,
+                GL_UNSIGNED_BYTE,
+                px.data()
+            );
+        }
+
+        ppmFile << "P3" << '\n' << size.x << " " << size.y << '\n' << "255" << '\n';
+
+        int k = 0;
+        for (int i = 0; i < size.x; i++) {
+            for (int j = 0; j < size.y; j++) {
+                ppmFile << static_cast<unsigned int>(px[k]) << ' '
+                    << static_cast<unsigned int>(px[k + 1]) << ' '
+                    << static_cast<unsigned int>(px[k + 2]) << ' ';
+                k += 3;
+            }
+            ppmFile << '\n';
+        }
+    }
+
+    bool isAtmosphereInFrustum(const glm::dmat4& MVMatrix, const glm::dvec3& position,
+                               double radius)
+    {
+        // Frustum Planes
+        glm::dvec3 col1 = glm::dvec3(MVMatrix[0][0], MVMatrix[1][0], MVMatrix[2][0]);
+        glm::dvec3 col2 = glm::dvec3(MVMatrix[0][1], MVMatrix[1][1], MVMatrix[2][1]);
+        glm::dvec3 col3 = glm::dvec3(MVMatrix[0][2], MVMatrix[1][2], MVMatrix[2][2]);
+        glm::dvec3 col4 = glm::dvec3(MVMatrix[0][3], MVMatrix[1][3], MVMatrix[2][3]);
+
+        glm::dvec3 leftNormal = col4 + col1;
+        glm::dvec3 rightNormal = col4 - col1;
+        glm::dvec3 bottomNormal = col4 + col2;
+        glm::dvec3 topNormal = col4 - col2;
+        glm::dvec3 nearNormal = col3 + col4;
+        glm::dvec3 farNormal = col4 - col3;
+
+        // Plane Distances
+        double leftDistance = MVMatrix[3][3] + MVMatrix[3][0];
+        double rightDistance = MVMatrix[3][3] - MVMatrix[3][0];
+        double bottomDistance = MVMatrix[3][3] + MVMatrix[3][1];
+        double topDistance = MVMatrix[3][3] - MVMatrix[3][1];
+        double nearDistance = MVMatrix[3][3] + MVMatrix[3][2];
+
+        // Normalize Planes
+        const double invLeftMag = 1.0 / glm::length(leftNormal);
+        leftNormal *= invLeftMag;
+        leftDistance *= invLeftMag;
+
+        const double invRightMag = 1.0 / glm::length(rightNormal);
+        rightNormal *= invRightMag;
+        rightDistance *= invRightMag;
+
+        const double invBottomMag = 1.0 / glm::length(bottomNormal);
+        bottomNormal *= invBottomMag;
+        bottomDistance *= invBottomMag;
+
+        const double invTopMag = 1.0 / glm::length(topNormal);
+        topNormal *= invTopMag;
+        topDistance *= invTopMag;
+
+        const double invNearMag = 1.0 / glm::length(nearNormal);
+        nearNormal *= invNearMag;
+        nearDistance *= invNearMag;
+
+        const double invFarMag = 1.0 / glm::length(farNormal);
+        farNormal *= invFarMag;
+
+        if (((glm::dot(leftNormal, position) + leftDistance) < -radius) ||
+            ((glm::dot(rightNormal, position) + rightDistance) < -radius) ||
+            ((glm::dot(bottomNormal, position) + bottomDistance) < -radius) ||
+            ((glm::dot(topNormal, position) + topDistance) < -radius) ||
+            ((glm::dot(nearNormal, position) + nearDistance) < -radius))
+            // The far plane testing is disabled because the atm has no depth.
+        {
+            return false;
+        }
+        return true;
+    }
+
+    void renderQuadForCalc(GLuint vao, GLsizei numberOfVertices) {
+        glBindVertexArray(vao);
+        glDrawArrays(GL_TRIANGLES, 0, numberOfVertices);
         glBindVertexArray(0);
     }
 } // namespace
@@ -181,7 +248,6 @@ void AtmosphereDeferredcaster::deinitialize() {
     glDeleteTextures(1, &_deltaSRayleighTableTexture);
     glDeleteTextures(1, &_deltaSMieTableTexture);
     glDeleteTextures(1, &_deltaJTableTexture);
-    glDeleteTextures(1, &_atmosphereTexture);
 }
 
 void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
@@ -202,18 +268,19 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
 
     // Radius is in KM
     const double scaledRadius = glm::length(
-        glm::dmat3(_modelTransform) * glm::dvec3(1000.0 * _atmosphereRadius, 0.0, 0.0)
+        glm::dmat3(_modelTransform) * glm::dvec3(KM_TO_M * _atmosphereRadius, 0.0, 0.0)
     );
 
+    // Number of planet radii to use as distance threshold for culling
+    const double DISTANCE_CULLING_RADII = 5000;
     if (distance > scaledRadius * DISTANCE_CULLING_RADII) {
         program.setUniform(_uniformCache.cullAtmosphere, 1);
     }
     else {
-        glm::dmat4 MV = glm::dmat4(
-            renderData.camera.sgctInternal.projectionMatrix()
-        ) * renderData.camera.combinedViewMatrix();
+        glm::dmat4 MV = glm::dmat4(renderData.camera.sgctInternal.projectionMatrix()) *
+                        renderData.camera.combinedViewMatrix();
 
-        const float totalAtmosphere = (_atmosphereRadius + ATM_EPS)* KM_TO_M;
+        const double totalAtmosphere = (scaledRadius + ATM_EPS);
         if (!isAtmosphereInFrustum(MV, tPlanetPosWorld, totalAtmosphere)) {
             program.setUniform(_uniformCache.cullAtmosphere, 1);
         }
@@ -222,8 +289,8 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
             program.setUniform(_uniformCache.Rg, _atmospherePlanetRadius);
             program.setUniform(_uniformCache.Rt, _atmosphereRadius);
             program.setUniform(
-                _uniformCache.groundRadianceEmittion,
-                _planetGroundRadianceEmittion
+                _uniformCache.groundRadianceEmission,
+                _planetGroundRadianceEmission
             );
             program.setUniform(_uniformCache.HR, _rayleighHeightScale);
             program.setUniform(_uniformCache.betaRayleigh, _rayleighScatteringCoeff);
@@ -242,10 +309,10 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
             // Object Space
             glm::dmat4 inverseModelMatrix = glm::inverse(_modelTransform);
             program.setUniform(
-                _uniformCache2.dInverseModelTransformMatrix,
+                _uniformCache.dInverseModelTransformMatrix,
                 inverseModelMatrix
             );
-            program.setUniform(_uniformCache2.dModelTransformMatrix, _modelTransform);
+            program.setUniform(_uniformCache.dModelTransformMatrix, _modelTransform);
 
             // Eye Space in SGCT to Eye Space in OS (SGCT View to OS Camera Rig)
 //            glm::dmat4 dSgctEye2OSEye = glm::inverse(
@@ -256,24 +323,27 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
             );
 
             // Eye Space in SGCT to OS World Space
-            program.setUniform(_uniformCache2.dSGCTViewToWorldMatrix,
-                dSGCTViewToWorldMatrix);
+            program.setUniform(
+                _uniformCache.dSGCTViewToWorldMatrix,
+                dSGCTViewToWorldMatrix
+            );
 
             // SGCT Projection to SGCT Eye Space
             glm::dmat4 dInverseProjection = glm::inverse(
-                glm::dmat4(renderData.camera.projectionMatrix()));
+                glm::dmat4(renderData.camera.projectionMatrix())
+            );
 
             glm::dmat4 inverseWholeMatrixPipeline =
-                inverseModelMatrix *
-                dSGCTViewToWorldMatrix *
-                dInverseProjection;
+                inverseModelMatrix * dSGCTViewToWorldMatrix * dInverseProjection;
 
-            program.setUniform(_uniformCache2.dSgctProjectionToModelTransformMatrix,
-                inverseWholeMatrixPipeline);
+            program.setUniform(
+                _uniformCache.dSgctProjectionToModelTransformMatrix,
+                inverseWholeMatrixPipeline
+            );
 
-            glm::dvec4 camPosObjCoords = inverseModelMatrix *
-                                     glm::dvec4(renderData.camera.eyePositionVec3(), 1.0);
-            program.setUniform(_uniformCache2.dCamPosObj, camPosObjCoords);
+            glm::dvec4 camPosObjCoords =
+                inverseModelMatrix * glm::dvec4(renderData.camera.eyePositionVec3(), 1.0);
+            program.setUniform(_uniformCache.dCamPosObj, camPosObjCoords);
 
             double lt;
             glm::dvec3 sunPosWorld = SpiceManager::ref().targetPosition(
@@ -300,7 +370,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
 
             // Sun Position in Object Space
             program.setUniform(
-                _uniformCache2.sunDirectionObj,
+                _uniformCache.sunDirectionObj,
                 glm::normalize(glm::dvec3(sunPosObj))
             );
 
@@ -333,18 +403,14 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
                     );
                     casterPos *= KM_TO_M; // converting to meters
 
-                    const std::string source = shadowConf.source.first;
-                    SceneGraphNode* sourceNode =
-                        global::renderEngine->scene()->sceneGraphNode(source);
-                    const std::string caster = shadowConf.caster.first;
-                    SceneGraphNode* casterNode =
-                        global::renderEngine->scene()->sceneGraphNode(caster);
+                    SceneGraphNode* sourceNode = sceneGraphNode(shadowConf.source.first);
+                    SceneGraphNode* casterNode = sceneGraphNode(shadowConf.caster.first);
 
                     if ((sourceNode == nullptr) || (casterNode == nullptr)) {
                         LERRORC(
                             "AtmosphereDeferredcaster",
                             "Invalid scenegraph node for the shadow's caster or shadow's "
-                            "receiver."
+                            "receiver"
                         );
                         return;
                     }
@@ -393,8 +459,8 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
                         shadowData.rc = shadowConf.caster.second * casterRadiusScale;
                         shadowData.sourceCasterVec = glm::normalize(sourceCasterVec);
                         shadowData.xp = xp_test;
-                        shadowData.xu = shadowData.rc * sc_length /
-                                        (shadowData.rs - shadowData.rc);
+                        shadowData.xu =
+                            shadowData.rc * sc_length / (shadowData.rs - shadowData.rc);
                         shadowData.casterPositionVec = casterPos;
                     }
                     _shadowDataArrayCache.push_back(shadowData);
@@ -404,10 +470,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
                 unsigned int counter = 0;
                 for (const ShadowRenderingStruct& sd : _shadowDataArrayCache) {
                     // Add the counter
-                    char* bf = fmt::format_to(
-                        _uniformNameBuffer + 16,
-                        "{}", counter
-                    );
+                    char* bf = fmt::format_to(_uniformNameBuffer + 16, "{}", counter);
 
                     std::strcpy(bf, "].isShadowing\0");
                     program.setUniform(_uniformNameBuffer, sd.isShadowing);
@@ -426,28 +489,27 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
                     }
                     counter++;
                 }
-                program.setUniform(_uniformCache2.hardShadows, _hardShadowsEnabled);
+                program.setUniform(_uniformCache.hardShadows, _hardShadowsEnabled);
             }
         }
     }
     _transmittanceTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
     program.setUniform(
-        _uniformCache2.transmittanceTexture,
+        _uniformCache.transmittanceTexture,
         _transmittanceTableTextureUnit
     );
 
     _irradianceTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_2D, _irradianceTableTexture);
-    program.setUniform(_uniformCache2.irradianceTexture, _irradianceTableTextureUnit);
+    program.setUniform(_uniformCache.irradianceTexture, _irradianceTableTextureUnit);
 
     _inScatteringTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_3D, _inScatteringTableTexture);
-    program.setUniform(_uniformCache2.inscatterTexture, _inScatteringTableTextureUnit);
+    program.setUniform(_uniformCache.inscatterTexture, _inScatteringTableTextureUnit);
 }
 
-void AtmosphereDeferredcaster::postRaycast(const RenderData&,
-                                           const DeferredcastData&,
+void AtmosphereDeferredcaster::postRaycast(const RenderData&, const DeferredcastData&,
                                            ghoul::opengl::ProgramObject&)
 {
     ZoneScoped
@@ -458,33 +520,32 @@ void AtmosphereDeferredcaster::postRaycast(const RenderData&,
     _inScatteringTableTextureUnit.deactivate();
 }
 
-std::string AtmosphereDeferredcaster::deferredcastPath() const {
-    return GlslDeferredcastPath;
+std::filesystem::path AtmosphereDeferredcaster::deferredcastPath() const {
+    return absPath("${MODULE_ATMOSPHERE}/shaders/atmosphere_deferred_fs.glsl");
 }
 
-std::string AtmosphereDeferredcaster::deferredcastFSPath() const {
-    return GlslDeferredcastFSPath;
+std::filesystem::path AtmosphereDeferredcaster::deferredcastFSPath() const {
+    return absPath("${MODULE_ATMOSPHERE}/shaders/atmosphere_deferred_fs.glsl");
 }
 
-std::string AtmosphereDeferredcaster::deferredcastVSPath() const {
-    return GlslDeferredcastVsPath;
+std::filesystem::path AtmosphereDeferredcaster::deferredcastVSPath() const {
+    return absPath("${MODULE_ATMOSPHERE}/shaders/atmosphere_deferred_vs.glsl");
 }
 
-std::string AtmosphereDeferredcaster::helperPath() const {
+std::filesystem::path AtmosphereDeferredcaster::helperPath() const {
     return ""; // no helper file
 }
 
 void AtmosphereDeferredcaster::initializeCachedVariables(
                                                     ghoul::opengl::ProgramObject& program)
 {
-    ghoul::opengl::updateUniformLocations(program, _uniformCache, UniformNames1);
-    ghoul::opengl::updateUniformLocations(program, _uniformCache2, UniformNames2);
+    ghoul::opengl::updateUniformLocations(program, _uniformCache, UniformNames);
 }
 
 void AtmosphereDeferredcaster::update(const UpdateData&) {}
 
-void AtmosphereDeferredcaster::setModelTransform(const glm::dmat4& transform) {
-    _modelTransform = transform;
+void AtmosphereDeferredcaster::setModelTransform(glm::dmat4 transform) {
+    _modelTransform = std::move(transform);
 }
 
 void AtmosphereDeferredcaster::setTime(double time) {
@@ -505,10 +566,10 @@ void AtmosphereDeferredcaster::setPlanetAverageGroundReflectance(
     _planetAverageGroundReflectance = averageGReflectance;
 }
 
-void AtmosphereDeferredcaster::setPlanetGroundRadianceEmittion(
-                                                             float groundRadianceEmittion)
+void AtmosphereDeferredcaster::setPlanetGroundRadianceEmission(
+                                                             float groundRadianceEmission)
 {
-    _planetGroundRadianceEmittion = groundRadianceEmittion;
+    _planetGroundRadianceEmission = groundRadianceEmission;
 }
 
 void AtmosphereDeferredcaster::setRayleighHeightScale(float rayleighHeightScale) {
@@ -576,17 +637,13 @@ void AtmosphereDeferredcaster::enableSunFollowing(bool enable) {
 void AtmosphereDeferredcaster::setPrecalculationTextureScale(
                                                          float preCalculatedTexturesScale)
 {
-    _calculationTextureScale = preCalculatedTexturesScale;
-    _transmittance_table_width *= static_cast<unsigned int>(_calculationTextureScale);
-    _transmittance_table_height *= static_cast<unsigned int>(_calculationTextureScale);
-    _irradiance_table_width *= static_cast<unsigned int>(_calculationTextureScale);
-    _irradiance_table_height *= static_cast<unsigned int>(_calculationTextureScale);
-    _delta_e_table_width *= static_cast<unsigned int>(_calculationTextureScale);
-    _delta_e_table_height *= static_cast<unsigned int>(_calculationTextureScale);
-    _r_samples *= static_cast<unsigned int>(_calculationTextureScale);
-    _mu_samples *= static_cast<unsigned int>(_calculationTextureScale);
-    _mu_s_samples *= static_cast<unsigned int>(_calculationTextureScale);
-    _nu_samples *= static_cast<unsigned int>(_calculationTextureScale);
+    _transmittanceTableSize *= static_cast<unsigned int>(preCalculatedTexturesScale);
+    _irradianceTableSize *= static_cast<unsigned int>(preCalculatedTexturesScale);
+    _deltaETableSize *= static_cast<unsigned int>(preCalculatedTexturesScale);
+    _r_samples *= static_cast<unsigned int>(preCalculatedTexturesScale);
+    _mu_samples *= static_cast<unsigned int>(preCalculatedTexturesScale);
+    _mu_s_samples *= static_cast<unsigned int>(preCalculatedTexturesScale);
+    _nu_samples *= static_cast<unsigned int>(preCalculatedTexturesScale);
 }
 
 void AtmosphereDeferredcaster::enablePrecalculationTexturesSaving() {
@@ -594,118 +651,114 @@ void AtmosphereDeferredcaster::enablePrecalculationTexturesSaving() {
 }
 
 void AtmosphereDeferredcaster::loadComputationPrograms() {
-    //============== Transmittance T =================
+    //
+    // Transmittance T
     if (!_transmittanceProgramObject) {
         _transmittanceProgramObject = ghoul::opengl::ProgramObject::Build(
             "transmittanceCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/transmittance_calc_vs.glsl"),
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
             absPath("${MODULE_ATMOSPHERE}/shaders/transmittance_calc_fs.glsl")
         );
     }
     using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
-    _transmittanceProgramObject->setIgnoreSubroutineUniformLocationError(
-        IgnoreError::Yes
-    );
     _transmittanceProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
 
-    //============== Irradiance E =================
+    //
+    // Irradiance E
     if (!_irradianceProgramObject) {
         _irradianceProgramObject = ghoul::opengl::ProgramObject::Build(
             "irradianceCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_calc_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_calc_fs.glsl"));
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_calc_fs.glsl")
+        );
     }
-    _irradianceProgramObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes);
     _irradianceProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
 
     if (!_irradianceSupTermsProgramObject) {
         _irradianceSupTermsProgramObject = ghoul::opengl::ProgramObject::Build(
             "irradianceSupTermsCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_sup_calc_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_sup_calc_fs.glsl"));
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_sup_calc_fs.glsl")
+        );
     }
-    _irradianceSupTermsProgramObject->setIgnoreSubroutineUniformLocationError(
-        IgnoreError::Yes
-    );
     _irradianceSupTermsProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
-
-    //============== InScattering S =================
+    
+    //
+    // InScattering S
     if (!_inScatteringProgramObject) {
         _inScatteringProgramObject = ghoul::opengl::ProgramObject::Build(
             "inScatteringCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_calc_vs.glsl"),
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
             absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_calc_fs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_calc_gs.glsl"));
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
+        );
     }
-    _inScatteringProgramObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes);
     _inScatteringProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
 
     if (!_inScatteringSupTermsProgramObject) {
         _inScatteringSupTermsProgramObject = ghoul::opengl::ProgramObject::Build(
             "inScatteringSupTermsCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_sup_calc_vs.glsl"),
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
             absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_sup_calc_fs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/inScattering_sup_calc_gs.glsl"));
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
+        );
     }
-    _inScatteringSupTermsProgramObject->setIgnoreSubroutineUniformLocationError(
-        IgnoreError::Yes
-    );
     _inScatteringSupTermsProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
 
-    //============== Delta E =================
+    //
+    // Delta E
     if (!_deltaEProgramObject) {
         _deltaEProgramObject = ghoul::opengl::ProgramObject::Build(
             "deltaECalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaE_calc_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaE_calc_fs.glsl"));
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+            absPath("${MODULE_ATMOSPHERE}/shaders/deltaE_calc_fs.glsl")
+        );
     }
-    _deltaEProgramObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes);
     _deltaEProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
 
-    //============== Irradiance finel E =================
+    //
+    // Irradiance finel E
     if (!_irradianceFinalProgramObject) {
         _irradianceFinalProgramObject = ghoul::opengl::ProgramObject::Build(
             "irradianceEFinalProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_final_vs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_final_fs.glsl"));
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
+            absPath("${MODULE_ATMOSPHERE}/shaders/irradiance_final_fs.glsl")
+        );
     }
-    _irradianceFinalProgramObject->setIgnoreSubroutineUniformLocationError(
-        IgnoreError::Yes
-    );
     _irradianceFinalProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
 
-    //============== Delta S =================
+    //
+    // Delta S
     if (!_deltaSProgramObject) {
         _deltaSProgramObject = ghoul::opengl::ProgramObject::Build(
             "deltaSCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_calc_vs.glsl"),
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
             absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_calc_fs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_calc_gs.glsl"));
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
+        );
     }
-    _deltaSProgramObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes);
     _deltaSProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
 
     if (!_deltaSSupTermsProgramObject) {
         _deltaSSupTermsProgramObject = ghoul::opengl::ProgramObject::Build(
             "deltaSSUPTermsCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_sup_calc_vs.glsl"),
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
             absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_sup_calc_fs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaS_sup_calc_gs.glsl"));
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
+        );
     }
-    _deltaSSupTermsProgramObject->setIgnoreSubroutineUniformLocationError(
-        IgnoreError::Yes
-    );
     _deltaSSupTermsProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
 
-    //============== Delta J (Radiance Scattered) =================
+    //
+    // Delta J (Radiance Scattered)
     if (!_deltaJProgramObject) {
         _deltaJProgramObject = ghoul::opengl::ProgramObject::Build(
             "deltaJCalcProgram",
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaJ_calc_vs.glsl"),
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_vs.glsl"),
             absPath("${MODULE_ATMOSPHERE}/shaders/deltaJ_calc_fs.glsl"),
-            absPath("${MODULE_ATMOSPHERE}/shaders/deltaJ_calc_gs.glsl"));
+            absPath("${MODULE_ATMOSPHERE}/shaders/calculation_gs.glsl")
+        );
     }
-    _deltaJProgramObject->setIgnoreSubroutineUniformLocationError(IgnoreError::Yes);
     _deltaJProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
 }
 
@@ -724,7 +777,8 @@ void AtmosphereDeferredcaster::unloadComputationPrograms() {
 
 void AtmosphereDeferredcaster::createComputationTextures() {
     if (!_atmosphereCalculated) {
-        //============== Transmittance =================
+        //
+        // Transmittance
         ghoul::opengl::TextureUnit transmittanceTableTextureUnit;
         transmittanceTableTextureUnit.activate();
         glGenTextures(1, &_transmittanceTableTexture);
@@ -735,10 +789,20 @@ void AtmosphereDeferredcaster::createComputationTextures() {
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
         // Stopped using a buffer object for GL_PIXEL_UNPACK_BUFFER
         glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, _transmittance_table_width,
-            _transmittance_table_height, 0, GL_RGB, GL_FLOAT, nullptr);
+        glTexImage2D(
+            GL_TEXTURE_2D,
+            0,
+            GL_RGB32F,
+            _transmittanceTableSize.x,
+            _transmittanceTableSize.y,
+            0,
+            GL_RGB,
+            GL_FLOAT,
+            nullptr
+        );
 
-        //============== Irradiance =================
+        //
+        // Irradiance
         ghoul::opengl::TextureUnit irradianceTableTextureUnit;
         irradianceTableTextureUnit.activate();
         glGenTextures(1, &_irradianceTableTexture);
@@ -748,10 +812,20 @@ void AtmosphereDeferredcaster::createComputationTextures() {
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
         glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, _irradiance_table_width,
-            _irradiance_table_height, 0, GL_RGB, GL_FLOAT, nullptr);
+        glTexImage2D(
+            GL_TEXTURE_2D,
+            0,
+            GL_RGB32F,
+            _irradianceTableSize.x,
+            _irradianceTableSize.y,
+            0,
+            GL_RGB,
+            GL_FLOAT,
+            nullptr
+        );
 
-        //============== InScattering =================
+        //
+        // InScattering
         ghoul::opengl::TextureUnit inScatteringTableTextureUnit;
         inScatteringTableTextureUnit.activate();
         glGenTextures(1, &_inScatteringTableTexture);
@@ -762,11 +836,22 @@ void AtmosphereDeferredcaster::createComputationTextures() {
         glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
         glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
         glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-        glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA32F, _mu_s_samples * _nu_samples,
-            _mu_samples, _r_samples, 0, GL_RGB, GL_FLOAT, nullptr);
+        glTexImage3D(
+            GL_TEXTURE_3D,
+            0,
+            GL_RGBA32F,
+            _mu_s_samples * _nu_samples,
+            _mu_samples,
+            _r_samples,
+            0,
+            GL_RGB,
+            GL_FLOAT,
+            nullptr
+        );
     }
 
-    //============== Delta E =================
+    //
+    // Delta E
     ghoul::opengl::TextureUnit deltaETableTextureUnit;
     deltaETableTextureUnit.activate();
     glGenTextures(1, &_deltaETableTexture);
@@ -776,10 +861,20 @@ void AtmosphereDeferredcaster::createComputationTextures() {
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, _delta_e_table_width,
-        _delta_e_table_height, 0, GL_RGB, GL_FLOAT, nullptr);
+    glTexImage2D(
+        GL_TEXTURE_2D,
+        0,
+        GL_RGB32F,
+        _deltaETableSize.x,
+        _deltaETableSize.y,
+        0,
+        GL_RGB,
+        GL_FLOAT,
+        nullptr
+    );
 
-    //============== Delta S =================
+    //
+    // Delta S
     ghoul::opengl::TextureUnit deltaSRayleighTableTextureUnit;
     deltaSRayleighTableTextureUnit.activate();
     glGenTextures(1, &_deltaSRayleighTableTexture);
@@ -790,8 +885,17 @@ void AtmosphereDeferredcaster::createComputationTextures() {
     glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB32F, _mu_s_samples * _nu_samples,
-        _mu_samples, _r_samples, 0, GL_RGB, GL_FLOAT, nullptr);
+    glTexImage3D(
+        GL_TEXTURE_3D,
+        0,
+        GL_RGB32F,
+        _mu_s_samples * _nu_samples,
+        _mu_samples,
+        _r_samples,
+        0, GL_RGB,
+        GL_FLOAT,
+        nullptr
+    );
 
     ghoul::opengl::TextureUnit deltaSMieTableTextureUnit;
     deltaSMieTableTextureUnit.activate();
@@ -803,10 +907,21 @@ void AtmosphereDeferredcaster::createComputationTextures() {
     glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB32F, _mu_s_samples * _nu_samples,
-        _mu_samples, _r_samples, 0, GL_RGB, GL_FLOAT, nullptr);
+    glTexImage3D(
+        GL_TEXTURE_3D,
+        0,
+        GL_RGB32F,
+        _mu_s_samples * _nu_samples,
+        _mu_samples,
+        _r_samples,
+        0,
+        GL_RGB,
+        GL_FLOAT,
+        nullptr
+    );
 
-    //============== Delta J (Radiance Scattered) =================
+    //
+    // Delta J (Radiance Scattered)
     ghoul::opengl::TextureUnit deltaJTableTextureUnit;
     deltaJTableTextureUnit.activate();
     glGenTextures(1, &_deltaJTableTexture);
@@ -817,27 +932,46 @@ void AtmosphereDeferredcaster::createComputationTextures() {
     glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-    glTexImage3D(GL_TEXTURE_3D, 0, GL_RGB32F, _mu_s_samples * _nu_samples,
-        _mu_samples, _r_samples, 0, GL_RGB, GL_FLOAT, nullptr);
-
+    glTexImage3D(
+        GL_TEXTURE_3D,
+        0,
+        GL_RGB32F,
+        _mu_s_samples * _nu_samples,
+        _mu_samples,
+        _r_samples,
+        0,
+        GL_RGB,
+        GL_FLOAT,
+        nullptr
+    );
 }
 
 void AtmosphereDeferredcaster::deleteComputationTextures() {
-    // Cleaning up
     glDeleteTextures(1, &_transmittanceTableTexture);
+    _transmittanceTableTexture = 0;
     glDeleteTextures(1, &_irradianceTableTexture);
+    _irradianceTableTexture = 0;
     glDeleteTextures(1, &_inScatteringTableTexture);
+    _inScatteringTableTexture = 0;
     glDeleteTextures(1, &_deltaETableTexture);
+    _deltaETableTexture = 0;
     glDeleteTextures(1, &_deltaSRayleighTableTexture);
+    _deltaSRayleighTableTexture = 0;
     glDeleteTextures(1, &_deltaSMieTableTexture);
+    _deltaSMieTableTexture = 0;
     glDeleteTextures(1, &_deltaJTableTexture);
+    _deltaJTableTexture = 0;
 }
 
 void AtmosphereDeferredcaster::deleteUnusedComputationTextures() {
     glDeleteTextures(1, &_deltaETableTexture);
+    _deltaETableTexture = 0;
     glDeleteTextures(1, &_deltaSRayleighTableTexture);
+    _deltaSRayleighTableTexture = 0;
     glDeleteTextures(1, &_deltaSMieTableTexture);
+    _deltaSMieTableTexture = 0;
     glDeleteTextures(1, &_deltaJTableTexture);
+    _deltaJTableTexture = 0;
 }
 
 void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
@@ -854,37 +988,32 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
 
     glDisable(GL_BLEND);
 
-    // ===========================================================
     // See Precomputed Atmosphere Scattering from Bruneton et al. paper, algorithm 4.1:
-    // ===========================================================
     glFramebufferTexture(
         GL_FRAMEBUFFER,
         GL_COLOR_ATTACHMENT0,
         _transmittanceTableTexture,
         0
     );
-    checkFrameBufferState("_transmittanceTableTexture");
-    glViewport(0, 0, _transmittance_table_width, _transmittance_table_height);
+    glViewport(0, 0, _transmittanceTableSize.x, _transmittanceTableSize.y);
     _transmittanceProgramObject->activate();
-    loadAtmosphereDataIntoShaderProgram(_transmittanceProgramObject);
-    //glClear(GL_COLOR_BUFFER_BIT);
-    static const float black[] = { 0.0f, 0.0f, 0.0f, 0.0f };
-    glClearBufferfv(GL_COLOR, 0, black);
+    loadAtmosphereDataIntoShaderProgram(*_transmittanceProgramObject);
+
+    static const float Black[] = { 0.f, 0.f, 0.f, 0.f };
+    glClearBufferfv(GL_COLOR, 0, Black);
     renderQuadForCalc(quadCalcVAO, vertexSize);
     if (_saveCalculationTextures) {
-        saveTextureToPPMFile(
+        saveTextureFile(
             GL_COLOR_ATTACHMENT0,
-            std::string("transmittance_texture.ppm"),
-            _transmittance_table_width,
-            _transmittance_table_height
+            "transmittance_texture.ppm",
+            _transmittanceTableSize
         );
     }
     _transmittanceProgramObject->deactivate();
 
     // line 2 in algorithm 4.1
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, _deltaETableTexture, 0);
-    checkFrameBufferState("_deltaETableTexture");
-    glViewport(0, 0, _delta_e_table_width, _delta_e_table_height);
+    glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
     _irradianceProgramObject->activate();
     transmittanceTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
@@ -892,15 +1021,14 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
         "transmittanceTexture",
         transmittanceTableTextureUnit
     );
-    loadAtmosphereDataIntoShaderProgram(_irradianceProgramObject);
+    loadAtmosphereDataIntoShaderProgram(*_irradianceProgramObject);
     glClear(GL_COLOR_BUFFER_BIT);
     renderQuadForCalc(quadCalcVAO, vertexSize);
     if (_saveCalculationTextures) {
-        saveTextureToPPMFile(
+        saveTextureFile(
             GL_COLOR_ATTACHMENT0,
-            std::string("deltaE_table_texture.ppm"),
-            _delta_e_table_width,
-            _delta_e_table_height
+            "deltaE_table_texture.ppm",
+            _deltaETableSize
         );
     }
     _irradianceProgramObject->deactivate();
@@ -920,7 +1048,6 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
     );
     GLenum colorBuffers[2] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 };
     glDrawBuffers(2, colorBuffers);
-    checkFrameBufferState("_deltaSRay and _deltaSMie TableTexture");
     glViewport(0, 0, _mu_s_samples * _nu_samples, _mu_samples);
     _inScatteringProgramObject->activate();
     transmittanceTableTextureUnit.activate();
@@ -929,24 +1056,22 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
         "transmittanceTexture",
         transmittanceTableTextureUnit
     );
-    loadAtmosphereDataIntoShaderProgram(_inScatteringProgramObject);
+    loadAtmosphereDataIntoShaderProgram(*_inScatteringProgramObject);
     glClear(GL_COLOR_BUFFER_BIT);
     for (int layer = 0; layer < _r_samples; ++layer) {
-        step3DTexture(_inScatteringProgramObject, layer);
+        step3DTexture(*_inScatteringProgramObject, layer, true);
         renderQuadForCalc(quadCalcVAO, vertexSize);
     }
     if (_saveCalculationTextures) {
-        saveTextureToPPMFile(
+        saveTextureFile(
             GL_COLOR_ATTACHMENT0,
-            std::string("deltaS_rayleigh_texture.ppm"),
-            _mu_s_samples * _nu_samples,
-            _mu_samples
+            "deltaS_rayleigh_texture.ppm",
+            glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
         );
-        saveTextureToPPMFile(
+        saveTextureFile(
             GL_COLOR_ATTACHMENT1,
-            std::string("deltaS_mie_texture.ppm"),
-            _mu_s_samples * _nu_samples,
-            _mu_samples
+            "deltaS_mie_texture.ppm",
+            glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
         );
     }
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D, 0, 0);
@@ -961,21 +1086,22 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
         _irradianceTableTexture,
         0
     );
-    checkFrameBufferState("_irradianceTableTexture");
     glDrawBuffer(GL_COLOR_ATTACHMENT0);
 
-    glViewport(0, 0, _delta_e_table_width, _delta_e_table_height);
+    glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
     _deltaEProgramObject->activate();
-    //_deltaEProgramObject->setUniform("line", 4);
     deltaETableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_2D, _deltaETableTexture);
     _deltaEProgramObject->setUniform("deltaETexture", deltaETableTextureUnit);
-    loadAtmosphereDataIntoShaderProgram(_deltaEProgramObject);
+    loadAtmosphereDataIntoShaderProgram(*_deltaEProgramObject);
     glClear(GL_COLOR_BUFFER_BIT);
     renderQuadForCalc(quadCalcVAO, vertexSize);
     if (_saveCalculationTextures) {
-        saveTextureToPPMFile(GL_COLOR_ATTACHMENT0, std::string("irradiance_texture.ppm"),
-            _delta_e_table_width, _delta_e_table_height);
+        saveTextureFile(
+            GL_COLOR_ATTACHMENT0,
+            "irradiance_texture.ppm",
+            _deltaETableSize
+        );
     }
     _deltaEProgramObject->deactivate();
 
@@ -986,7 +1112,6 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
         _inScatteringTableTexture,
         0
     );
-    checkFrameBufferState("_inScatteringTableTexture");
     glViewport(0, 0, _mu_s_samples * _nu_samples, _mu_samples);
     _deltaSProgramObject->activate();
     deltaSRayleighTableTextureUnit.activate();
@@ -995,15 +1120,18 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
     glBindTexture(GL_TEXTURE_3D, _deltaSMieTableTexture);
     _deltaSProgramObject->setUniform("deltaSRTexture", deltaSRayleighTableTextureUnit);
     _deltaSProgramObject->setUniform("deltaSMTexture", deltaSMieTableTextureUnit);
-    loadAtmosphereDataIntoShaderProgram(_deltaSProgramObject);
+    loadAtmosphereDataIntoShaderProgram(*_deltaSProgramObject);
     glClear(GL_COLOR_BUFFER_BIT);
     for (int layer = 0; layer < _r_samples; ++layer) {
-        step3DTexture(_deltaSProgramObject, layer, false);
+        step3DTexture(*_deltaSProgramObject, layer, false);
         renderQuadForCalc(quadCalcVAO, vertexSize);
     }
     if (_saveCalculationTextures) {
-        saveTextureToPPMFile(GL_COLOR_ATTACHMENT0, std::string("S_texture.ppm"),
-            _mu_s_samples * _nu_samples, _mu_samples);
+        saveTextureFile(
+            GL_COLOR_ATTACHMENT0,
+            "S_texture.ppm",
+            glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
+        );
     }
     _deltaSProgramObject->deactivate();
 
@@ -1016,7 +1144,6 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
             _deltaJTableTexture,
             0
         );
-        checkFrameBufferState("_deltaJTableTexture");
         glViewport(0, 0, _mu_s_samples * _nu_samples, _mu_samples);
         _deltaJProgramObject->activate();
         if (scatteringOrder == 2) {
@@ -1043,15 +1170,17 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
         deltaSMieTableTextureUnit.activate();
         glBindTexture(GL_TEXTURE_3D, _deltaSMieTableTexture);
         _deltaJProgramObject->setUniform("deltaSMTexture", deltaSMieTableTextureUnit);
-        loadAtmosphereDataIntoShaderProgram(_deltaJProgramObject);
+        loadAtmosphereDataIntoShaderProgram(*_deltaJProgramObject);
         for (int layer = 0; layer < _r_samples; ++layer) {
-            step3DTexture(_deltaJProgramObject, layer);
+            step3DTexture(*_deltaJProgramObject, layer, true);
             renderQuadForCalc(quadCalcVAO, vertexSize);
         }
         if (_saveCalculationTextures) {
-            saveTextureToPPMFile(GL_COLOR_ATTACHMENT0,
+            saveTextureFile(
+                GL_COLOR_ATTACHMENT0,
                 fmt::format("deltaJ_texture-scattering_order-{}.ppm", scatteringOrder),
-                _mu_s_samples * _nu_samples, _mu_samples);
+                glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
+            );
         }
         _deltaJProgramObject->deactivate();
 
@@ -1062,8 +1191,7 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
             _deltaETableTexture,
             0
         );
-        checkFrameBufferState("_deltaETableTexture");
-        glViewport(0, 0, _delta_e_table_width, _delta_e_table_height);
+        glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
         _irradianceSupTermsProgramObject->activate();
         if (scatteringOrder == 2) {
             _irradianceSupTermsProgramObject->setUniform("firstIteraction", 1);
@@ -1089,12 +1217,14 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
             "deltaSMTexture",
             deltaSMieTableTextureUnit
         );
-        loadAtmosphereDataIntoShaderProgram(_irradianceSupTermsProgramObject);
+        loadAtmosphereDataIntoShaderProgram(*_irradianceSupTermsProgramObject);
         renderQuadForCalc(quadCalcVAO, vertexSize);
         if (_saveCalculationTextures) {
-            saveTextureToPPMFile(GL_COLOR_ATTACHMENT0,
+            saveTextureFile(
+                GL_COLOR_ATTACHMENT0,
                 fmt::format("deltaE_texture-scattering_order-{}.ppm", scatteringOrder),
-                _delta_e_table_width, _delta_e_table_height);
+                _deltaETableSize
+            );
         }
         _irradianceSupTermsProgramObject->deactivate();
 
@@ -1105,7 +1235,6 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
             _deltaSRayleighTableTexture,
             0
         );
-        checkFrameBufferState("_deltaSRayleighTableTexture");
         glViewport(0, 0, _mu_s_samples * _nu_samples, _mu_samples);
         _inScatteringSupTermsProgramObject->activate();
         transmittanceTableTextureUnit.activate();
@@ -1120,17 +1249,16 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
             "deltaJTexture",
             deltaJTableTextureUnit
         );
-        loadAtmosphereDataIntoShaderProgram(_inScatteringSupTermsProgramObject);
+        loadAtmosphereDataIntoShaderProgram(*_inScatteringSupTermsProgramObject);
         for (int layer = 0; layer < _r_samples; ++layer) {
-            step3DTexture(_inScatteringSupTermsProgramObject, layer);
+            step3DTexture(*_inScatteringSupTermsProgramObject, layer, true);
             renderQuadForCalc(quadCalcVAO, vertexSize);
         }
         if (_saveCalculationTextures) {
-            saveTextureToPPMFile(GL_COLOR_ATTACHMENT0,
-                fmt::format("deltaS_texture-scattering_order-{}.ppm",
-                    scatteringOrder),
-                _mu_s_samples * _nu_samples,
-                _mu_samples
+            saveTextureFile(
+                GL_COLOR_ATTACHMENT0,
+                fmt::format("deltaS_texture-scattering_order-{}.ppm", scatteringOrder),
+                glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
             );
         }
         _inScatteringSupTermsProgramObject->deactivate();
@@ -1146,8 +1274,7 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
             _irradianceTableTexture,
             0
         );
-        checkFrameBufferState("_irradianceTableTexture");
-        glViewport(0, 0, _delta_e_table_width, _delta_e_table_height);
+        glViewport(0, 0, _deltaETableSize.x, _deltaETableSize.y);
         _irradianceFinalProgramObject->activate();
         deltaETableTextureUnit.activate();
         glBindTexture(GL_TEXTURE_2D, _deltaETableTexture);
@@ -1155,13 +1282,14 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
             "deltaETexture",
             deltaETableTextureUnit
         );
-        loadAtmosphereDataIntoShaderProgram(_irradianceFinalProgramObject);
+        loadAtmosphereDataIntoShaderProgram(*_irradianceFinalProgramObject);
         renderQuadForCalc(quadCalcVAO, vertexSize);
         if (_saveCalculationTextures) {
-            saveTextureToPPMFile(GL_COLOR_ATTACHMENT0,
-                fmt::format("irradianceTable_order-{}.ppm",
-                    scatteringOrder),
-                _delta_e_table_width, _delta_e_table_height);
+            saveTextureFile(
+                GL_COLOR_ATTACHMENT0,
+                fmt::format("irradianceTable_order-{}.ppm", scatteringOrder),
+                _deltaETableSize
+            );
         }
         _irradianceFinalProgramObject->deactivate();
 
@@ -1172,7 +1300,6 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
             _inScatteringTableTexture,
             0
         );
-        checkFrameBufferState("_inScatteringTableTexture");
         glViewport(0, 0, _mu_s_samples * _nu_samples, _mu_samples);
         _deltaSSupTermsProgramObject->activate();
         deltaSRayleighTableTextureUnit.activate();
@@ -1181,16 +1308,16 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
             "deltaSTexture",
             deltaSRayleighTableTextureUnit
         );
-        loadAtmosphereDataIntoShaderProgram(_deltaSSupTermsProgramObject);
+        loadAtmosphereDataIntoShaderProgram(*_deltaSSupTermsProgramObject);
         for (int layer = 0; layer < _r_samples; ++layer) {
-            step3DTexture(_deltaSSupTermsProgramObject, layer, false);
+            step3DTexture(*_deltaSSupTermsProgramObject, layer, false);
             renderQuadForCalc(quadCalcVAO, vertexSize);
         }
         if (_saveCalculationTextures) {
-            saveTextureToPPMFile(GL_COLOR_ATTACHMENT0,
-                fmt::format("inscatteringTable_order-{}.ppm",
-                    scatteringOrder),
-                _mu_s_samples * _nu_samples, _mu_samples);
+            saveTextureFile(GL_COLOR_ATTACHMENT0,
+                fmt::format("inscatteringTable_order-{}.ppm", scatteringOrder),
+                glm::ivec2(_mu_s_samples * _nu_samples, _mu_samples)
+            );
         }
         _deltaSSupTermsProgramObject->deactivate();
 
@@ -1202,22 +1329,18 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO,
 }
 
 void AtmosphereDeferredcaster::preCalculateAtmosphereParam() {
-    //==========================================================
-    //========= Load Shader Programs for Calculations ==========
-    //==========================================================
+    // Load Shader Programs for Calculations
     loadComputationPrograms();
 
-    //==========================================================
-    //============ Create Textures for Calculations ============
-    //==========================================================
+    // Create Textures for Calculations
     createComputationTextures();
 
     // Saves current FBO first
     GLint defaultFBO;
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
 
-    GLint m_viewport[4];
-    global::renderEngine->openglStateCache().viewport(m_viewport);
+    GLint viewport[4];
+    global::renderEngine->openglStateCache().viewport(viewport);
 
     // Creates the FBO for the calculations
     GLuint calcFBO;
@@ -1232,288 +1355,81 @@ void AtmosphereDeferredcaster::preCalculateAtmosphereParam() {
     createRenderQuad(&quadCalcVAO, &quadCalcVBO, 1.0f);
 
     // Starting Calculations...
-    LDEBUG("Starting precalculations for scattering effects...");
+    LDEBUG("Starting precalculations for scattering effects");
 
-    //==========================================================
-    //=================== Execute Calculations =================
-    //==========================================================
+    // Execute Calculations
     executeCalculations(quadCalcVAO, drawBuffers, 6);
 
     deleteUnusedComputationTextures();
 
     // Restores system state
     glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
-    global::renderEngine->openglStateCache().setViewportState(m_viewport);
+    global::renderEngine->openglStateCache().setViewportState(viewport);
     glDeleteBuffers(1, &quadCalcVBO);
     glDeleteVertexArrays(1, &quadCalcVAO);
     glDeleteFramebuffers(1, &calcFBO);
 
-    LDEBUG("Ended precalculations for Atmosphere effects...");
+    LDEBUG("Ended precalculations for Atmosphere effects");
 }
 
 void AtmosphereDeferredcaster::loadAtmosphereDataIntoShaderProgram(
-                                std::unique_ptr<ghoul::opengl::ProgramObject>& shaderProg)
+                                                 ghoul::opengl::ProgramObject& shaderProg)
 {
-    shaderProg->setUniform("Rg", _atmospherePlanetRadius);
-    shaderProg->setUniform("Rt", _atmosphereRadius);
-    shaderProg->setUniform("AverageGroundReflectance", _planetAverageGroundReflectance);
-    shaderProg->setUniform("groundRadianceEmittion", _planetGroundRadianceEmittion);
-    shaderProg->setUniform("HR", _rayleighHeightScale);
-    shaderProg->setUniform("betaRayleigh", _rayleighScatteringCoeff);
-    shaderProg->setUniform("HM", _mieHeightScale);
-    shaderProg->setUniform("betaMieScattering", _mieScatteringCoeff);
-    shaderProg->setUniform("betaMieExtinction", _mieExtinctionCoeff);
-    shaderProg->setUniform("mieG", _miePhaseConstant);
-    shaderProg->setUniform("sunRadiance", _sunRadianceIntensity);
-    shaderProg->setUniform("TRANSMITTANCE_W", _transmittance_table_width);
-    shaderProg->setUniform("TRANSMITTANCE_H", _transmittance_table_height);
-    shaderProg->setUniform("SKY_W", _irradiance_table_width);
-    shaderProg->setUniform("SKY_H", _irradiance_table_height);
-    shaderProg->setUniform("OTHER_TEXTURES_W", _delta_e_table_width);
-    shaderProg->setUniform("OTHER_TEXTURES_H", _delta_e_table_height);
-    shaderProg->setUniform("SAMPLES_R", _r_samples);
-    shaderProg->setUniform("SAMPLES_MU", _mu_samples);
-    shaderProg->setUniform("SAMPLES_MU_S", _mu_s_samples);
-    shaderProg->setUniform("SAMPLES_NU", _nu_samples);
-    shaderProg->setUniform("ozoneLayerEnabled", _ozoneEnabled);
-    shaderProg->setUniform("HO", _ozoneHeightScale);
-    shaderProg->setUniform("betaOzoneExtinction", _ozoneExtinctionCoeff);
+    shaderProg.setUniform("Rg", _atmospherePlanetRadius);
+    shaderProg.setUniform("Rt", _atmosphereRadius);
+    shaderProg.setUniform("AverageGroundReflectance", _planetAverageGroundReflectance);
+    shaderProg.setUniform("groundRadianceEmission", _planetGroundRadianceEmission);
+    shaderProg.setUniform("HR", _rayleighHeightScale);
+    shaderProg.setUniform("betaRayleigh", _rayleighScatteringCoeff);
+    shaderProg.setUniform("HM", _mieHeightScale);
+    shaderProg.setUniform("betaMieScattering", _mieScatteringCoeff);
+    shaderProg.setUniform("betaMieExtinction", _mieExtinctionCoeff);
+    shaderProg.setUniform("mieG", _miePhaseConstant);
+    shaderProg.setUniform("sunRadiance", _sunRadianceIntensity);
+    shaderProg.setUniform("TRANSMITTANCE", _transmittanceTableSize);
+    shaderProg.setUniform("SKY", _irradianceTableSize);
+    shaderProg.setUniform("OTHER_TEXTURES", _deltaETableSize);
+    shaderProg.setUniform("SAMPLES_R", _r_samples);
+    shaderProg.setUniform("SAMPLES_MU", _mu_samples);
+    shaderProg.setUniform("SAMPLES_MU_S", _mu_s_samples);
+    shaderProg.setUniform("SAMPLES_NU", _nu_samples);
+    shaderProg.setUniform("ozoneLayerEnabled", _ozoneEnabled);
+    shaderProg.setUniform("HO", _ozoneHeightScale);
+    shaderProg.setUniform("betaOzoneExtinction", _ozoneExtinctionCoeff);
 }
 
-void AtmosphereDeferredcaster::checkFrameBufferState(
-                                                    const std::string& codePosition) const
-{
-    if (glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
-        LERROR("Framework not built. " + codePosition);
-        GLenum fbErr = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-        switch (fbErr) {
-            case GL_FRAMEBUFFER_UNDEFINED:
-                LERROR("Indefined framebuffer.");
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-                LERROR("Incomplete, missing attachement.");
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-                LERROR("Framebuffer doesn't have at least one image attached to it.");
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
-                LERROR(
-                    "Returned if the value of GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is "
-                    "GL_NONE for any color attachment point(s) named by GL_DRAW_BUFFERi."
-                );
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
-                LERROR(
-                    "Returned if GL_READ_BUFFER is not GL_NONE and the value of "
-                    "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is GL_NONE for the color "
-                    "attachment point named by GL_READ_BUFFER.");
-                break;
-            case GL_FRAMEBUFFER_UNSUPPORTED:
-                LERROR(
-                    "Returned if the combination of internal formats of the attached "
-                    "images violates an implementation - dependent set of restrictions."
-                );
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
-                LERROR(
-                    "Returned if the value of GL_RENDERBUFFE_r_samples is not the same "
-                    "for all attached renderbuffers; if the value of GL_TEXTURE_SAMPLES "
-                    "is the not same for all attached textures; or , if the attached "
-                    "images are a mix of renderbuffers and textures, the value of "
-                    "GL_RENDERBUFFE_r_samples does not match the value of "
-                    "GL_TEXTURE_SAMPLES."
-                );
-                LERROR(
-                    "Returned if the value of GL_TEXTURE_FIXED_SAMPLE_LOCATIONS is not "
-                    "the same for all attached textures; or , if the attached images are "
-                    "a mix of renderbuffers and textures, the value of "
-                    "GL_TEXTURE_FIXED_SAMPLE_LOCATIONS is not GL_TRUE for all attached "
-                    "textures."
-                );
-                break;
-            case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS:
-                LERROR(
-                    "Returned if any framebuffer attachment is layered, and any "
-                    "populated attachment is not layered, or if all populated color "
-                    "attachments are not from textures of the same target."
-                );
-                break;
-            default:
-                LDEBUG("No error found checking framebuffer: " + codePosition);
-                break;
-            }
-    }
-}
-
-void AtmosphereDeferredcaster::renderQuadForCalc(GLuint vao, GLsizei numberOfVertices) {
-    glBindVertexArray(vao);
-    glDrawArrays(GL_TRIANGLES, 0, numberOfVertices);
-    glBindVertexArray(0);
-}
-
-void AtmosphereDeferredcaster::step3DTexture(
-                                std::unique_ptr<ghoul::opengl::ProgramObject>& shaderProg,
-                                                                                int layer,
-                                                                       bool doCalculation)
+void AtmosphereDeferredcaster::step3DTexture(ghoul::opengl::ProgramObject& shaderProg,
+                                             int layer, bool doCalculation)
 {
     // See OpenGL redbook 8th Edition page 556 for Layered Rendering
     if (doCalculation) {
-        float earth2 = _atmospherePlanetRadius * _atmospherePlanetRadius;
-        float atm2 = _atmosphereRadius * _atmosphereRadius;
-        float diff = atm2 - earth2;
-        float ri = static_cast<float>(layer) / static_cast<float>(_r_samples - 1);
-        float ri_2 = ri * ri;
-        float epsilon =
-            (layer == 0) ?
-            0.01f :
-            (layer == (_r_samples - 1)) ? -0.001f : 0.0f;
-        float r = sqrtf(earth2 + ri_2 * diff) + epsilon;
-        float dminG = r - _atmospherePlanetRadius;
-        float dminT = _atmosphereRadius - r;
-        float dh = sqrtf(r * r - earth2);
-        float dH = dh + sqrtf(diff);
-
-        shaderProg->setUniform("r", r);
-        shaderProg->setUniform("dhdH", dminT, dH, dminG, dh);
-    }
-
-    shaderProg->setUniform("layer", layer);
-}
-
-void AtmosphereDeferredcaster::saveTextureToPPMFile(GLenum color_buffer_attachment,
-                                                    const std::string& fileName,
-                                                    int width, int height) const
-{
-    std::fstream ppmFile;
-
-    ppmFile.open(fileName.c_str(), std::fstream::out);
-    if (ppmFile.is_open()) {
-        unsigned char * pixels = new unsigned char[width*height * 3];
-        for (int t = 0; t < width*height * 3; ++t)
-            pixels[t] = 255;
-
-        if (color_buffer_attachment != GL_DEPTH_ATTACHMENT) {
-            glReadBuffer(color_buffer_attachment);
-            glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, pixels);
-
-        }
-        else {
-            glReadPixels(
-                0,
-                0,
-                width,
-                height,
-                GL_DEPTH_COMPONENT,
-                GL_UNSIGNED_BYTE,
-                pixels
-            );
-        }
-
-        ppmFile << "P3" << std::endl;
-        ppmFile << width << " " << height << std::endl;
-        ppmFile << "255" << std::endl;
-
-        std::cout << "\n\nFILE\n\n";
-        int k = 0;
-        for (int i = 0; i < width; i++) {
-            for (int j = 0; j < height; j++) {
-                ppmFile << static_cast<unsigned int>(pixels[k]) << " "
-                    << static_cast<unsigned int>(pixels[k + 1]) << " "
-                    << static_cast<unsigned int>(pixels[k + 2]) << " ";
-                k += 3;
+        const float earth2 = _atmospherePlanetRadius * _atmospherePlanetRadius;
+        const float diff = _atmosphereRadius * _atmosphereRadius - earth2;
+        const float ri = static_cast<float>(layer) / static_cast<float>(_r_samples - 1);
+        const float eps = [&]() {
+            if (layer == 0) {
+                return 0.01f;
             }
-            ppmFile << std::endl;
-        }
-        delete[] pixels;
+            else {
+                if (layer == (_r_samples - 1)) {
+                    return -0.001f;
+                }
+                else {
+                    return 0.f;
+                }
+            }
+        }();
+        const float r = std::sqrt(earth2 + ri * ri * diff) + eps;
+        const float dminG = r - _atmospherePlanetRadius;
+        const float dminT = _atmosphereRadius - r;
+        const float dh = std::sqrt(r * r - earth2);
+        const float dH = dh + std::sqrt(diff);
 
-        ppmFile.close();
+        shaderProg.setUniform("r", r);
+        shaderProg.setUniform("dhdH", dminT, dH, dminG, dh);
     }
-}
 
-bool AtmosphereDeferredcaster::isAtmosphereInFrustum(const glm::dmat4& MVMatrix,
-                                                     const glm::dvec3& position,
-                                                     double radius) const
-{
-
-    // Frustum Planes
-    //glm::dvec3 col1(MVMatrix[0], MVMatrix[4], MVMatrix[8]);
-    //glm::dvec3 col2(MVMatrix[1], MVMatrix[5], MVMatrix[9]);
-    //glm::dvec3 col3(MVMatrix[2], MVMatrix[6], MVMatrix[10]);
-    //glm::dvec3 col4(MVMatrix[3], MVMatrix[7], MVMatrix[11]);
-
-    glm::dvec3 col1(MVMatrix[0][0], MVMatrix[1][0], MVMatrix[2][0]);
-    glm::dvec3 col2(MVMatrix[0][1], MVMatrix[1][1], MVMatrix[2][1]);
-    glm::dvec3 col3(MVMatrix[0][2], MVMatrix[1][2], MVMatrix[2][2]);
-    glm::dvec3 col4(MVMatrix[0][3], MVMatrix[1][3], MVMatrix[2][3]);
-
-    glm::dvec3 leftNormal = col4 + col1;
-    glm::dvec3 rightNormal = col4 - col1;
-    glm::dvec3 bottomNormal = col4 + col2;
-    glm::dvec3 topNormal = col4 - col2;
-    glm::dvec3 nearNormal = col3 + col4;
-    glm::dvec3 farNormal = col4 - col3;
-
-    // Plane Distances
-    //double leftDistance = MVMatrix[15] + MVMatrix[12];
-    //double rightDistance = MVMatrix[15] - MVMatrix[12];
-    //double bottomDistance = MVMatrix[15] + MVMatrix[13];
-    //double topDistance = MVMatrix[15] - MVMatrix[13];
-    //double nearDistance = MVMatrix[15] + MVMatrix[14];
-    //double farDistance = MVMatrix[15] - MVMatrix[14];
-
-    double leftDistance = MVMatrix[3][3] + MVMatrix[3][0];
-    double rightDistance = MVMatrix[3][3] - MVMatrix[3][0];
-    double bottomDistance = MVMatrix[3][3] + MVMatrix[3][1];
-    double topDistance = MVMatrix[3][3] - MVMatrix[3][1];
-    double nearDistance = MVMatrix[3][3] + MVMatrix[3][2];
-//    double farDistance = MVMatrix[3][3] - MVMatrix[3][2];
-
-    // Normalize Planes
-    double invMag = 1.0 / glm::length(leftNormal);
-    leftNormal *= invMag;
-    leftDistance *= invMag;
-
-    invMag = 1.0 / glm::length(rightNormal);
-    rightNormal *= invMag;
-    rightDistance *= invMag;
-
-    invMag = 1.0 / glm::length(bottomNormal);
-    bottomNormal *= invMag;
-    bottomDistance *= invMag;
-
-    invMag = 1.0 / glm::length(topNormal);
-    topNormal *= invMag;
-    topDistance *= invMag;
-
-    invMag = 1.0 / glm::length(nearNormal);
-    nearNormal *= invMag;
-    nearDistance *= invMag;
-
-    invMag = 1.0 / glm::length(farNormal);
-    farNormal *= invMag;
-//    farDistance *= invMag;
-
-    if ((glm::dot(leftNormal, position) + leftDistance) < -radius) {
-        return false;
-    }
-    else if ((glm::dot(rightNormal, position) + rightDistance) < -radius) {
-        return false;
-    }
-    else if ((glm::dot(bottomNormal, position) + bottomDistance) < -radius) {
-        return false;
-    }
-    else if ((glm::dot(topNormal, position) + topDistance) < -radius) {
-        return false;
-    }
-    else if ((glm::dot(nearNormal, position) + nearDistance) < -radius) {
-        return false;
-    }
-    // The far plane testing is disabled because the atm has no depth.
-    /*else if ((glm::dot(farNormal, position) + farDistance) < -radius) {
-    return false;
-    }*/
-
-    return true;
+    shaderProg.setUniform("layer", layer);
 }
 
 } // namespace openspace
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index f0f142824a..608c5d47b4 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -31,7 +31,6 @@
 #include <ghoul/glm.h>
 #include <ghoul/opengl/textureunit.h>
 #include <ghoul/opengl/uniformcache.h>
-
 #include <string>
 #include <vector>
 
@@ -46,6 +45,16 @@ struct RenderData;
 struct DeferredcastData;
 struct ShadowConfiguration;
 
+struct ShadowRenderingStruct {
+    double xu = 0.0;
+    double xp = 0.0;
+    double rs = 0.0;
+    double rc = 0.0;
+    glm::dvec3 sourceCasterVec = glm::dvec3(0.0);
+    glm::dvec3 casterPositionVec = glm::dvec3(0.0);
+    bool isShadowing = false;
+};
+
 class AtmosphereDeferredcaster : public Deferredcaster {
 public:
     virtual ~AtmosphereDeferredcaster() = default;
@@ -53,27 +62,27 @@ public:
     void initialize();
     void deinitialize();
     void preRaycast(const RenderData& renderData, const DeferredcastData& deferredData,
-                    ghoul::opengl::ProgramObject& program) override;
+        ghoul::opengl::ProgramObject& program) override;
     void postRaycast(const RenderData& renderData, const DeferredcastData& deferredData,
-                     ghoul::opengl::ProgramObject& program) override;
+        ghoul::opengl::ProgramObject& program) override;
 
-    std::string deferredcastPath() const override;
-    std::string deferredcastVSPath() const override;
-    std::string deferredcastFSPath() const override;
-    std::string helperPath() const override;
+    std::filesystem::path deferredcastPath() const override;
+    std::filesystem::path deferredcastVSPath() const override;
+    std::filesystem::path deferredcastFSPath() const override;
+    std::filesystem::path helperPath() const override;
 
-    void initializeCachedVariables(ghoul::opengl::ProgramObject&) override;
+    void initializeCachedVariables(ghoul::opengl::ProgramObject& program) override;
 
     void update(const UpdateData&) override;
 
     void preCalculateAtmosphereParam();
 
-    void setModelTransform(const glm::dmat4 &transform);
+    void setModelTransform(glm::dmat4 transform);
     void setTime(double time);
     void setAtmosphereRadius(float atmRadius);
     void setPlanetRadius(float planetRadius);
     void setPlanetAverageGroundReflectance(float averageGReflectance);
-    void setPlanetGroundRadianceEmittion(float groundRadianceEmittion);
+    void setPlanetGroundRadianceEmission(float groundRadianceEmission);
     void setRayleighHeightScale(float rayleighHeightScale);
     void enableOzone(bool enable);
     void setOzoneHeightScale(float ozoneHeightScale);
@@ -100,20 +109,9 @@ private:
     void deleteUnusedComputationTextures();
     void executeCalculations(GLuint quadCalcVAO, GLenum drawBuffers[1],
         GLsizei vertexSize);
-    void step3DTexture(std::unique_ptr<ghoul::opengl::ProgramObject>& shaderProg,
-        int layer, bool doCalculation = true);
-    void checkFrameBufferState(const std::string& codePosition) const;
-    void loadAtmosphereDataIntoShaderProgram(
-        std::unique_ptr<ghoul::opengl::ProgramObject> & shaderProg
-    );
-    void renderQuadForCalc(GLuint vao, GLsizei numberOfVertices);
-    void saveTextureToPPMFile(GLenum color_buffer_attachment, const std::string& fileName,
-        int width, int height) const;
-    bool isAtmosphereInFrustum(const glm::dmat4& MVMatrix, const glm::dvec3& position,
-        double radius) const;
-
-    // Number of planet radii to use as distance threshold for culling
-    const double DISTANCE_CULLING_RADII = 5000;
+    void step3DTexture(ghoul::opengl::ProgramObject& shaderProg, int layer,
+        bool doCalculation);
+    void loadAtmosphereDataIntoShaderProgram(ghoul::opengl::ProgramObject& shaderProg);
 
     std::unique_ptr<ghoul::opengl::ProgramObject> _transmittanceProgramObject;
     std::unique_ptr<ghoul::opengl::ProgramObject> _irradianceProgramObject;
@@ -125,19 +123,13 @@ private:
     std::unique_ptr<ghoul::opengl::ProgramObject> _deltaSProgramObject;
     std::unique_ptr<ghoul::opengl::ProgramObject> _deltaSSupTermsProgramObject;
     std::unique_ptr<ghoul::opengl::ProgramObject> _deltaJProgramObject;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _atmosphereProgramObject;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _deferredAtmosphereProgramObject;
 
-    UniformCache(cullAtmosphere, Rg, Rt,
-        groundRadianceEmittion, HR, betaRayleigh, HM,
-        betaMieExtinction, mieG, sunRadiance, ozoneLayerEnabled,
-        HO, betaOzoneExtinction, SAMPLES_R,
-        SAMPLES_MU, SAMPLES_MU_S, SAMPLES_NU) _uniformCache;
-    UniformCache(dInverseModelTransformMatrix, dModelTransformMatrix,
-        dSgctProjectionToModelTransformMatrix,
-        dSGCTViewToWorldMatrix, dCamPosObj, sunDirectionObj,
-        hardShadows, transmittanceTexture, irradianceTexture,
-        inscatterTexture) _uniformCache2;
+    UniformCache(cullAtmosphere, Rg, Rt, groundRadianceEmission, HR, betaRayleigh, HM,
+        betaMieExtinction, mieG, sunRadiance, ozoneLayerEnabled, HO, betaOzoneExtinction,
+        SAMPLES_R, SAMPLES_MU, SAMPLES_MU_S, SAMPLES_NU, dInverseModelTransformMatrix, 
+        dModelTransformMatrix, dSgctProjectionToModelTransformMatrix,
+        dSGCTViewToWorldMatrix, dCamPosObj, sunDirectionObj, hardShadows,
+        transmittanceTexture, irradianceTexture, inscatterTexture) _uniformCache;
 
     GLuint _transmittanceTableTexture = 0;
     GLuint _irradianceTableTexture = 0;
@@ -146,7 +138,6 @@ private:
     GLuint _deltaSRayleighTableTexture = 0;
     GLuint _deltaSMieTableTexture = 0;
     GLuint _deltaJTableTexture = 0;
-    GLuint _atmosphereTexture = 0;
 
     ghoul::opengl::TextureUnit _transmittanceTableTextureUnit;
     ghoul::opengl::TextureUnit _irradianceTableTextureUnit;
@@ -159,7 +150,7 @@ private:
     float _atmosphereRadius = 0.f;
     float _atmospherePlanetRadius = 0.f;
     float _planetAverageGroundReflectance = 0.f;
-    float _planetGroundRadianceEmittion = 0.f;
+    float _planetGroundRadianceEmission = 0.f;
     float _rayleighHeightScale = 0.f;
     float _ozoneHeightScale = 0.f;
     float _mieHeightScale = 0.f;
@@ -173,12 +164,9 @@ private:
     glm::dvec3 _ellipsoidRadii = glm::vec3(0.f);
 
     // Atmosphere Textures Dimmensions
-    int _transmittance_table_width = 256;
-    int _transmittance_table_height = 64;
-    int _irradiance_table_width = 64;
-    int _irradiance_table_height = 16;
-    int _delta_e_table_width = 64;
-    int _delta_e_table_height = 16;
+    glm::ivec2 _transmittanceTableSize = glm::ivec2(256, 64);
+    glm::ivec2 _irradianceTableSize = glm::ivec2(64, 16);
+    glm::ivec2 _deltaETableSize = glm::ivec2(64, 16);
     int _r_samples = 32;
     int _mu_samples = 128;
     int _mu_s_samples = 32;
@@ -192,7 +180,6 @@ private:
     bool _hardShadowsEnabled = false;
 
     // Atmosphere Debugging
-    float _calculationTextureScale = 1.f;
     bool _saveCalculationTextures = false;
 
     std::vector<ShadowRenderingStruct> _shadowDataArrayCache;
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index ec8550a43d..e14ff893a7 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -25,33 +25,10 @@
 #include <modules/atmosphere/rendering/renderableatmosphere.h>
 
 #include <modules/atmosphere/rendering/atmospheredeferredcaster.h>
-#include <modules/space/rendering/planetgeometry.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/deferredcastermanager.h>
-#include <openspace/rendering/renderengine.h>
-#include <openspace/rendering/renderer.h>
-#include <openspace/scene/scenegraphnode.h>
-#include <openspace/util/time.h>
-#include <openspace/util/spicemanager.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/io/texture/texturereader.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/misc/assert.h>
-#include <ghoul/misc/invariants.h>
-#include <ghoul/misc/profiling.h>
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
-#include <ghoul/opengl/textureunit.h>
-#include <glm/gtx/string_cast.hpp>
-#include <fstream>
-#include <memory>
-#include <optional>
-
-#ifdef WIN32
-#define _USE_MATH_DEFINES
-#endif // WIN32
 #include <math.h>
 
 namespace {
@@ -69,7 +46,7 @@ namespace {
         "phase"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo GroundRadianceEmittioninfo = {
+    constexpr openspace::properties::Property::PropertyInfo GroundRadianceEmissionInfo = {
         "GroundRadianceEmission",
         "Percentage of initial radiance emitted from ground",
         "Multiplier of the ground radiance color during the rendering phase"
@@ -197,7 +174,7 @@ namespace {
         // [[codegen::verbatim(MieScatteringExtinctionPropCoeffInfo.description)]]
         std::optional<float> mieScatteringExtinctionPropCoefficient;
 
-        // [[codegen::verbatim(GroundRadianceEmittioninfo.description)]]
+        // [[codegen::verbatim(GroundRadianceEmissionInfo.description)]]
         float groundRadianceEmission;
 
         struct Rayleigh {
@@ -243,16 +220,14 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableAtmosphere::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "atmosphere_renderable_atmosphere";
-    return doc;
+    return codegen::doc<Parameters>("atmosphere_renderable_atmosphere");
 }
 
 RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _atmosphereHeight(AtmosphereHeightInfo, 60.f, 0.1f, 99.0f)
     , _groundAverageReflectance(AverageGroundReflectanceInfo, 0.f, 0.f, 1.f)
-    , _groundRadianceEmission(GroundRadianceEmittioninfo, 0.f, 0.f, 1.f)
+    , _groundRadianceEmission(GroundRadianceEmissionInfo, 0.f, 0.f, 1.f)
     , _rayleighHeightScale(RayleighHeightScaleInfo, 0.f, 0.1f, 50.f)
     , _rayleighScatteringCoeff(
         RayleighScatteringCoeffInfo,
@@ -282,9 +257,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         _deferredCasterNeedsUpdate = true;
         _deferredCasterNeedsCalculation = true;
     };
-    auto updateWithoutCalculation = [this]() {
-        _deferredCasterNeedsUpdate = true;
-    };
+    auto updateWithoutCalculation = [this]() { _deferredCasterNeedsUpdate = true; };
 
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
@@ -413,8 +386,8 @@ glm::dmat4 RenderableAtmosphere::computeModelTransformMatrix(
                                                        const TransformData& transformData)
 {
     // scale the planet to appropriate size since the planet is a unit sphere
-    return glm::translate(glm::dmat4(1.0), transformData.translation) * // Translation
-        glm::dmat4(transformData.rotation) *  // Spice rotation
+    return glm::translate(glm::dmat4(1.0), transformData.translation) *
+        glm::dmat4(transformData.rotation) *
         glm::scale(glm::dmat4(1.0), glm::dvec3(transformData.scale));
 }
 
@@ -448,7 +421,7 @@ void RenderableAtmosphere::updateAtmosphereParameters() {
     _deferredcaster->setAtmosphereRadius(_planetRadius + _atmosphereHeight);
     _deferredcaster->setPlanetRadius(_planetRadius);
     _deferredcaster->setPlanetAverageGroundReflectance(_groundAverageReflectance);
-    _deferredcaster->setPlanetGroundRadianceEmittion(_groundRadianceEmission);
+    _deferredcaster->setPlanetGroundRadianceEmission(_groundRadianceEmission);
     _deferredcaster->setRayleighHeightScale(_rayleighHeightScale);
     _deferredcaster->enableOzone(_ozoneEnabled);
     _deferredcaster->setOzoneHeightScale(_ozoneHeightScale);
diff --git a/modules/atmosphere/rendering/renderableatmosphere.h b/modules/atmosphere/rendering/renderableatmosphere.h
index 7fe0cbb477..63ec3afeab 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.h
+++ b/modules/atmosphere/rendering/renderableatmosphere.h
@@ -33,9 +33,7 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/util/updatestructures.h>
-
 #include <ghoul/opengl/textureunit.h>
-
 #include <memory>
 #include <string>
 #include <vector>
@@ -57,16 +55,6 @@ struct ShadowConfiguration {
     std::pair<std::string, double> caster;
 };
 
-struct ShadowRenderingStruct {
-    double xu = 0.0;
-    double xp = 0.0;
-    double rs = 0.0;
-    double rc = 0.0;
-    glm::dvec3 sourceCasterVec = glm::dvec3(0.0);
-    glm::dvec3 casterPositionVec = glm::dvec3(0.0);
-    bool isShadowing = false;
-};
-
 namespace documentation { struct Documentation; }
 namespace planetgeometry { class PlanetGeometry; }
 
diff --git a/modules/atmosphere/shaders/atmosphere_common.glsl b/modules/atmosphere/shaders/atmosphere_common.glsl
index fd0ca1eb2f..6a0884f861 100644
--- a/modules/atmosphere/shaders/atmosphere_common.glsl
+++ b/modules/atmosphere/shaders/atmosphere_common.glsl
@@ -27,42 +27,38 @@
  * from Eric Bruneton is used in the following code.                                     * 
  ****************************************************************************************/
 
- /**
+/**
  * Precomputed Atmospheric Scattering
  * Copyright (c) 2008 INRIA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ *    conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *    of conditions and the following disclaimer in the documentation and/or other
+ *    materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without specific
+ *    prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 // Atmosphere Rendering Parameters 
 uniform float Rg;
 uniform float Rt;
 uniform float AverageGroundReflectance;
-uniform float groundRadianceEmittion;
+uniform float groundRadianceEmission;
 uniform float HR;
 uniform vec3 betaRayleigh;
 uniform float HO;
@@ -75,12 +71,9 @@ uniform float sunRadiance;
 
 uniform bool ozoneLayerEnabled;
 
-uniform int TRANSMITTANCE_W;
-uniform int TRANSMITTANCE_H;
-uniform int SKY_W;
-uniform int SKY_H;
-uniform int OTHER_TEXTURES_W;
-uniform int OTHER_TEXTURES_H;
+uniform ivec2 TRANSMITTANCE;
+uniform ivec2 SKY;
+uniform ivec2 OTHER_TEXTURES;
 uniform int SAMPLES_R;
 uniform int SAMPLES_MU;
 uniform int SAMPLES_MU_S;
@@ -95,46 +88,44 @@ const int IRRADIANCE_INTEGRAL_SAMPLES = 32;
 const int INSCATTER_SPHERICAL_INTEGRAL_SAMPLES = 16;
 
 const float M_PI = 3.141592657;
+const float M_2PI = 2.0 * M_PI;
 
 uniform sampler2D transmittanceTexture;
 
-float Rg2    = Rg * Rg;
-float Rt2    = Rt * Rt;
-float H      = sqrt(Rt2 - Rg2);
-float H2     = Rt2 - Rg2;
-float invSamplesMu = 1.0f / float(SAMPLES_MU);
-float invSamplesR = 1.0f / float(SAMPLES_R);
-float invSamplesMuS = 1.0f / float(SAMPLES_MU_S);
-float invSamplesNu = 1.0f / float(SAMPLES_NU);
+float Rg2 = Rg * Rg;
+float Rt2 = Rt * Rt;
+float H = sqrt(Rt2 - Rg2);
+float H2 = Rt2 - Rg2;
+float invSamplesMu = 1.0 / float(SAMPLES_MU);
+float invSamplesR = 1.0 / float(SAMPLES_R);
+float invSamplesMuS = 1.0 / float(SAMPLES_MU_S);
+float invSamplesNu = 1.0 / float(SAMPLES_NU);
 float RtMinusRg = float(Rt - Rg);
-float invRtMinusRg = 1.0f / RtMinusRg;
+float invRtMinusRg = 1.0 / RtMinusRg;
 
 float opticalDepth(float localH, float r, float mu, float d) {
-  float invH = 1.0/localH;
-  float a    = sqrt((0.5 * invH)*r);
-  vec2 a01   = a*vec2(mu, mu + d / r);
-  vec2 a01s  = sign(a01);
-  vec2 a01sq = a01*a01;
-  float x    = a01s.y > a01s.x ? exp(a01sq.x) : 0.0;
-  vec2 y     = a01s / (2.3193*abs(a01) + sqrt(1.52*a01sq + 4.0)) * vec2(1.0, exp(-d*invH*(d/(2.0*r)+mu)));
-  return sqrt((6.2831*H)*r) * exp((Rg-r)*invH) * (x + dot(y, vec2(1.0, -1.0)));
+  float invH = 1.0 / localH;
+  float a = sqrt(0.5 * invH * r);
+  vec2 a01 = a * vec2(mu, mu + d / r);
+  vec2 a01s = sign(a01);
+  vec2 a01sq = a01 * a01;
+  float x = a01s.y > a01s.x ? exp(a01sq.x) : 0.0;
+  vec2 y = a01s / (2.3193 * abs(a01) + sqrt(1.52 * a01sq + 4.0)) * vec2(1.0, exp(-d * invH * (d / (2.0 * r) + mu)));
+  return sqrt(M_2PI * H * r) * exp((Rg-r)*invH) * (x + dot(y, vec2(1.0, -1.0)));
 }
 
 vec3 analyticTransmittance(float r, float mu, float d) {
+  vec3 ozone = vec3(0.0);
   if (ozoneLayerEnabled) {
-    return exp(-betaRayleigh * opticalDepth(HR, r, mu, d) -
-             betaOzoneExtinction * (0.0000006) * opticalDepth(HO, r, mu, d) -
-             betaMieExtinction * opticalDepth(HM, r, mu, d));
-  }
-  else {
-    return exp(-betaRayleigh * opticalDepth(HR, r, mu, d) -
-               betaMieExtinction * opticalDepth(HM, r, mu, d));
+    ozone = betaOzoneExtinction * (0.0000006) * opticalDepth(HO, r, mu, d);
   }
+  return exp(-betaRayleigh * opticalDepth(HR, r, mu, d) - ozone -
+    betaMieExtinction * opticalDepth(HM, r, mu, d));
 }
 
 vec3 irradiance(sampler2D sampler, float r, float muSun) {
-  float u_r     = (r - Rg) * invRtMinusRg;
-  float u_muSun = (muSun + 0.2) / (1.0 + 0.2);
+  float u_r = (r - Rg) * invRtMinusRg;
+  float u_muSun = (muSun + 0.2) / 1.2;
   return texture(sampler, vec2(u_muSun, u_r)).rgb;
 }
 
@@ -143,160 +134,104 @@ vec3 irradiance(sampler2D sampler, float r, float muSun) {
 //=============== General Functions ==============//
 //================================================//
 // In the following shaders r (altitude) is the length of vector/position x in the
-// atmosphere (or on the top of it when considering an observer in space),
-// where the light is comming from the opposite direction of the view direction,
-// here the vector v or viewDirection.
-// Rg is the planet radius and Rt the atmosphere radius.
+// atmosphere (or on the top of it when considering an observer in space), where the light
+// is coming from the opposite direction of the view direction, here the vector v or
+// viewDirection. Rg is the planet radius and Rt the atmosphere radius.
 
-//--- Calculate the distance of the ray starting at x (height r)
-// until the planet's ground or top of atmosphere. ---
+// 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 
 float rayDistance(float r, float mu) {
-  // 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.
+  // 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 atmRadiusEps = Rt + ATM_EPSILON;
-  float rayDistanceAtmosphere = -r * mu +
-    sqrt(r * r * (mu * mu - 1.0f) + atmRadiusEps * atmRadiusEps); 
-  float delta = r * r * (mu * mu - 1.0f) + Rg * Rg;
+  float atmRadiusEps2 = (Rt + ATM_EPSILON) * (Rt + ATM_EPSILON);
+  float mu2 = mu * mu;
+  float r2 = r * r;
+  float rg2 = Rg * Rg;
+  float rayDistanceAtmosphere = -r * mu + sqrt(r2 * (mu2 - 1.0) + atmRadiusEps2); 
+  float delta = r2 * (mu2 - 1.0) + rg2;
 
   // Ray may be hitting ground
-  if (delta >= 0.0f) {
+  if (delta >= 0.0) {
     float rayDistanceGround = -r * mu - sqrt(delta);
-    if (rayDistanceGround >= 0.0f) {
+    if (rayDistanceGround >= 0.0) {
       return min(rayDistanceAtmosphere, rayDistanceGround);
     }
   }
   return rayDistanceAtmosphere;
 }
 
-//-- Given the window's fragment coordinates, for a defined
-// viewport, gives back the interpolated r e [Rg, Rt] and
-// mu e [-1, 1] --
-// r := height of starting point vect(x)
-// mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
-void unmappingRAndMu(out float r, out float mu) {
-  float u_mu  = gl_FragCoord.x / float(TRANSMITTANCE_W);
-  float u_r   = gl_FragCoord.y / float(TRANSMITTANCE_H);
-  
-  // In the paper u_r^2 = (r^2-Rg^2)/(Rt^2-Rg^2)
-  // So, extracting r from u_r in the above equation:
-  //r  = sqrt( Rg * Rg + (u_r * u_r) * (Rt * Rt - Rg * Rg) );
-  r  = Rg + (u_r * u_r) * RtMinusRg;
-  
-  // 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 Colliene.
-  // One must remember that mu is defined from 0 to PI/2 + epsillon. 
-  mu = -0.15f + tan(1.5f * u_mu) / tan(1.5f) * (1.0f + 0.15f);
-}
-
-//-- Given the windows's fragment coordinates, for a defined view port,
-// gives back the interpolated r e [Rg, Rt] and muSun e [-1, 1] --
-// r := height of starting point vect(x)
-// muSun := cosine of the zeith angle of vec(s). Or muSun = (vec(s) * vec(v))
-void unmappingRAndMuSun(out float r, out float muSun) {
-  // See Bruneton and Colliene to understand the mapping.
-  muSun = -0.2f + (gl_FragCoord.x - 0.5f) / (float(OTHER_TEXTURES_W) - 1.0f) * (1.0f + 0.2f);
-  //r  = Rg + (gl_FragCoord.y - 0.5f) / (float(OTHER_TEXTURES_H) - 1.0f) * (Rt - Rg);
-  r  = Rg + (gl_FragCoord.y - 0.5f) / (float(OTHER_TEXTURES_H) ) * RtMinusRg;
-}
-
-//-- Given the windows's fragment coordinates, for a defined view port,
-// gives back the interpolated r e [Rg, Rt] and muSun e [-1, 1] for the
-// Irradiance deltaE texture table --
-// r := height of starting point vect(x)
-// muSun := cosine of the zeith angle of vec(s). Or muSun = (vec(s) * vec(v))
-void unmappingRAndMuSunIrradiance(out float r, out float muSun) {
-  // See Bruneton and Colliene to understand the mapping.
-  muSun = -0.2f + (gl_FragCoord.x - 0.5f) / (float(SKY_W) - 1.0f) * (1.0f + 0.2f);
-  r  = Rg + (gl_FragCoord.y - 0.5f) / (float(SKY_H) - 1.0f) * RtMinusRg;
-}
-
-//-- Given the windows's fragment coordinates, for a defined view port,
-// gives back the interpolated r e [Rg, Rt] and mu, muSun amd nu e [-1, 1] --
+// Given the windows's fragment coordinates, for a defined view port, gives back the
+// interpolated r e [Rg, Rt] and mu, muSun amd nu e [-1, 1]
 // r := height of starting point vect(x)
 // mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
 // muSun := cosine of the zeith angle of vec(s). Or muSun = (vec(s) * vec(v))
 // nu := cosone of the angle between vec(s) and vec(v)
-// dhdH := it is a vec4. dhdH.x stores the dminT := Rt - r, dhdH.y stores the dH value (see paper),
-// dhdH.z stores dminG := r - Rg and dhdH.w stores dh (see paper).
+// dhdH := it is a vec4. dhdH.x stores the dminT := Rt - r, dhdH.y stores the dH value
+//         (see paper), dhdH.z stores dminG := r - Rg and dhdH.w stores dh (see paper)
 void unmappingMuMuSunNu(float r, vec4 dhdH, out float mu, out float muSun, out float nu) {
   // Window coordinates of pixel (uncentering also)
-  float fragmentX = gl_FragCoord.x - 0.5f;
-  float fragmentY = gl_FragCoord.y - 0.5f;
+  vec2 fragment = gl_FragCoord.xy - vec2(0.5);
 
   // Pre-calculations
-  //float Rg2 = Rg * Rg;
-  //float Rt2 = Rt * Rt;
   float r2  = r * r;
   
-  float halfSAMPLE_MU = float(SAMPLES_MU) / 2.0f;
-  // 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
-  if (fragmentY < halfSAMPLE_MU) {
-    float ud = 1.0f - (fragmentY / (halfSAMPLE_MU - 1.0f));
+  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
+  if (fragment.y < halfSAMPLE_MU) {
+    float ud = 1.0 - (fragment.y / (halfSAMPLE_MU - 1.0));
     float d  = min(max(dhdH.z, ud * dhdH.w), dhdH.w * 0.999);
-    // cosine law: Rg^2 = r^2 + d^2 - 2rdcos(pi-theta)
-    // where cosine(theta) = mu
+    // cosine law: Rg^2 = r^2 + d^2 - 2rdcos(pi-theta) where cosine(theta) = mu
     mu = (Rg2 - r2 - d * d) / (2.0 * r * d);
-    // We can't handle a ray inside the planet, i.e.,
-    // when r ~ Rg, so we check against it.
-    // If that is the case, we approximate to
-    // a ray touching the ground.
+    // We can't handle a ray inside the planet, i.e., when r ~ Rg, so we check against it.
+    // If that is the case, we approximate to a ray touching the ground.
     // cosine(pi-theta) = dh/r = sqrt(r^2-Rg^2)
     // cosine(theta) = - sqrt(1 - Rg^2/r^2)
     mu = min(mu, -sqrt(1.0 - (Rg2 / r2)) - 0.001);
   }
-  // The light ray is touching the atmosphere and
-  // not the ground
+  // The light ray is touching the atmosphere and not the ground
   else {
-    float d = (fragmentY - halfSAMPLE_MU) / (halfSAMPLE_MU - 1.0f);
+    float d = (fragment.y - halfSAMPLE_MU) / (halfSAMPLE_MU - 1.0);
     d = min(max(dhdH.x, d * dhdH.y), dhdH.y * 0.999);
-    // cosine law: Rt^2 = r^2 + d^2 - 2rdcos(pi-theta)
-    // whre cosine(theta) = mu
-    mu = (Rt2 - r2 - d * d) / (2.0f * r * d);
+    // cosine law: Rt^2 = r^2 + d^2 - 2rdcos(pi-theta) where cosine(theta) = mu
+    mu = (Rt2 - r2 - d * d) / (2.0 * r * d);
   }
   
-  float modValueMuSun = mod(fragmentX, float(SAMPLES_MU_S)) / (float(SAMPLES_MU_S) - 1.0f);
+  float modValueMuSun = mod(fragment.x, float(SAMPLES_MU_S)) / (float(SAMPLES_MU_S) - 1.0);
   // The following mapping is different from the paper. See Colliene for an details.
-  muSun = tan((2.0f * modValueMuSun - 1.0f + 0.26f) * 1.1f) / tan(1.26f * 1.1f);
-  nu = -1.0f + floor(fragmentX / float(SAMPLES_MU_S)) / (float(SAMPLES_NU) - 1.0f) * 2.0f;
+  muSun = tan((2.0 * modValueMuSun - 1.0 + 0.26) * 1.1f) / tan(1.26 * 1.1);
+  nu = -1.0 + floor(fragment.x / float(SAMPLES_MU_S)) / (float(SAMPLES_NU) - 1.0) * 2.0;
 }
 
-
-//-- Function to access the transmittance texture. Given r
-// and mu, returns the transmittance of a ray starting at vec(x),
-// height r, and direction vec(v), mu, and length until it hits
-// the ground or the top of atmosphere. --
+// Function to access the transmittance texture. Given r and mu, returns the transmittance
+// of a ray starting at vec(x), height r, and direction vec(v), mu, and length until it
+// hits the ground or the top of atmosphere.
 // r := height of starting point vect(x)
 // mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
-vec3 transmittanceLUT(float r, float mu) {
-  // Given the position x (here the altitude r) and the view
-  // angle v (here the cosine(v)= mu), we map this
-  float u_r  = sqrt((r - Rg) * invRtMinusRg);
-  //float u_r  = sqrt((r*r - Rg*Rg) / (Rt*Rt - Rg*Rg));
-  // See Colliene to understand the different mapping.
-  float u_mu = atan((mu + 0.15f) / (1.0f + 0.15f) * tan(1.5f)) / 1.5f;
+vec3 transmittance(float r, float mu) {
+  // Given the position x (here the altitude r) and the view angle v
+  // (here the cosine(v)= mu), we map this
+  float u_r = sqrt((r - Rg) * invRtMinusRg);
+  // See Colliene to understand the mapping
+  float u_mu = atan((mu + 0.15) / 1.15 * tan(1.5)) / 1.5;
   
   return texture(transmittanceTexture, vec2(u_mu, u_r)).rgb;
 }
 
-// -- Given a position r and direction mu, calculates de transmittance
-// along the ray with length d. This function uses the propriety
-// of Transmittance: T(a,b) = TableT(a,v)/TableT(b, v) --
+// Given a position r and direction mu, calculates de transmittance along the ray with
+// length d. This function uses the propriety of Transmittance:
+// T(a,b) = TableT(a,v)/TableT(b, v)
 // r := height of starting point vect(x)
 // mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
 vec3 transmittance(float r, float mu, float d) {
-  // 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 (hight r): T(x,d) = T(x,v)/T(d,v).
+  // 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);
@@ -305,105 +240,75 @@ vec3 transmittance(float r, float mu, float d) {
   //      = (r*mu + d) / r_i
   float mui = (d + r * mu) / ri;
 
-  // It's important to remember that we calculate the Transmittance
-  // table only for zenith angles between 0 and pi/2+episilon.
-  // Then, if mu < 0.0, we just need to invert the view direction
-  // and the start and end points between them, i.e., if
+  // It's important to remember that we calculate the Transmittance table only for zenith
+  // angles between 0 and pi/2+episilon. Then, if mu < 0.0, we just need to invert the
+  // view direction and the start and end points between them, i.e., if
   // x --> x0, then x0-->x.
   // Also, let's use the property: T(a,c) = T(a,b)*T(b,c)
-  // Because T(a,c) and T(b,c) are already in the table T,
-  // T(a,b) = T(a,c)/T(b,c).
-  if (mu > 0.0f) {
-    return min(transmittanceLUT(r, mu) / 
-               transmittanceLUT(ri, mui), 1.0f);
+  // Because T(a,c) and T(b,c) are already in the table T, T(a,b) = T(a,c)/T(b,c).
+  if (mu > 0.0) {
+    return min(transmittance(r, mu) /  transmittance(ri, mui), 1.0);
   }
   else {
-    return min(transmittanceLUT(ri, -mui) / 
-               transmittanceLUT(r, -mu), 1.0f);
+    return min(transmittance(ri, -mui) / transmittance(r, -mu), 1.0);
   }
 }
 
-// -- Calculates Rayleigh phase function given the
-// scattering cosine angle mu --
+// Calculates Rayleigh phase function given the scattering cosine angle mu
 // mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
 float rayleighPhaseFunction(float mu) {
     //return (3.0f / (16.0f * M_PI)) * (1.0f + mu * mu);
-    return 0.0596831036 * (1.0f + mu * mu);
+    return 0.0596831036 * (1.0 + mu * mu);
 }
 
-// -- Calculates Mie phase function given the
-// scattering cosine angle mu --
-// mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
-float miePhaseFunction(float mu) {
-  //return (3.0f / (8.0f * M_PI)) * 
-  //      ( ( (1.0f - (mieG * mieG) ) * (1.0f + mu * mu) ) / 
-  //      ( (2.0f + mieG * mieG) *
-  //        pow(1.0f + mieG * mieG - 2.0f * mieG * mu, 3.0f/2.0f) ) );
-  // return 1.5f * 1.0f / (4.0f * M_PI) * (1.0f - mieG * mieG) *
-  //   pow(1.0f + (mieG * mieG) - 2.0f * mieG * mu, -3.0f/2.0f) * (1.0f + mu * mu) / (2.0f + mieG*mieG);
-
+// Calculates Mie phase function given the scattering cosine angle mu
+// mu   := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v)) / r
+// mieG := mie phase function value
+float miePhaseFunction(float mu, float mieG) {
   float mieG2 = mieG * mieG;
-  return 0.1193662072 * (1.0f - mieG2) *
-    pow(1.0f + mieG2 - 2.0f * mieG * mu, -1.5f) * (1.0f + mu * mu) / (2.0f + mieG2);
+  return 0.1193662072 * (1.0 - mieG2) *
+    pow(1.0 + mieG2 - 2.0 * mieG * mu, -1.5) * (1.0 + mu * mu) / (2.0 + mieG2);
 }
 
-// -- Given the height rm view-zenith angle (cosine) mu,
-// sun-zenith angle (cosine) muSun and the angle (cosine)
-// between the vec(s) and vec(v), nu, we access the 3D textures
-// and interpolate between them (r) to find the value for the
-// 4D texture. --
+// Given the height rm view-zenith angle (cosine) mu, sun-zenith angle (cosine) muSun and
+// the angle (cosine) between the vec(s) and vec(v), nu, we access the 3D textures and
+// interpolate between them (r) to find the value for the 4D texture.
 // r := height of starting point vect(x)
 // mu := cosine of the zeith angle of vec(v). Or mu = (vec(x) * vec(v))/r
 // muSun := cosine of the zeith angle of vec(s). Or muSun = (vec(s) * vec(v))
 // nu := cosine of the angle between vec(s) and vec(v)
 vec4 texture4D(sampler3D table, float r, float mu, float muSun, float nu) {
-  //float Rg2    = Rg * Rg;
-  //float Rt2    = Rt * Rt;
-  float r2     = r * r;
-  //float H      = sqrt(Rt2 - Rg2);
-  float rho    = sqrt(r2 - Rg2);
-  float rmu    = r * mu;
-  float delta  = rmu * rmu - r2 + Rg2;
-  //float invSamplesMu = 1.0f / float(SAMPLES_MU);
-  //float invSamplesR = 1.0f / float(SAMPLES_R);
-  //float invSamplesMuS = 1.0f / float(SAMPLES_MU_S);
-  //float invSamplesNu = 1.0f / float(SAMPLES_NU);
-  // vec4 cst     = rmu < 0.0f && delta > 0.0f ?
-  //   vec4(1.0f, 0.0f, 0.0f, 0.5f - 0.5f / float(SAMPLES_MU)) :
-  //   vec4(-1.0f, H * H, H, 0.5f + 0.5f / float(SAMPLES_MU));
+  float r2 = r * r;
+  float rho = sqrt(r2 - Rg2);
+  float rmu = r * mu;
+  float delta = rmu * rmu - r2 + Rg2;
 
-  vec4 cst     = rmu < 0.0f && delta > 0.0f ?
-    vec4(1.0f, 0.0f, 0.0f, 0.5f - 0.5f * invSamplesMu) :
-    vec4(-1.0f, H2, H, 0.5f + 0.5f * invSamplesMu);
+  vec4 cst = rmu < 0.0 && delta > 0.0 ?
+    vec4(1.0, 0.0, 0.0, 0.5 - 0.5 * invSamplesMu) :
+    vec4(-1.0, H2, H, 0.5 + 0.5 * invSamplesMu);
 
-  //float u_r    = 0.5f / float(SAMPLES_R) + rho / H * (1.0f - 1.0f / float(SAMPLES_R));
-  float u_r    = 0.5f * invSamplesR + rho / H * (1.0f - invSamplesR);
-  //float u_mu   = cst.w + (rmu * cst.x + sqrt(delta + cst.y)) / (rho + cst.z) * (0.5f - 1.0f / float(SAMPLES_MU));
-  float u_mu   = cst.w + (rmu * cst.x + sqrt(delta + cst.y)) / (rho + cst.z) * (0.5f - invSamplesMu);
-  // float u_mu_s = 0.5f / float(SAMPLES_MU_S) +
-  //   (atan(max(muSun, -0.1975) * tan(1.26f * 1.1f)) / 1.1f + (1.0f - 0.26f)) * 0.5f * (1.0f - 1.0f / float(SAMPLES_MU_S));
-  float u_mu_s = 0.5f * invSamplesMuS +
-    (atan(max(muSun, -0.1975) * tan(1.386f)) * 0.9090909090909090 + (0.74f)) * 0.5f * (1.0f - invSamplesMuS);
-  float lerp = (nu + 1.0f) / 2.0f * (float(SAMPLES_NU) - 1.0f);
+  float u_r = 0.5 * invSamplesR + rho / H * (1.0 - invSamplesR);
+  float u_mu = cst.w + (rmu * cst.x + sqrt(delta + cst.y)) / (rho + cst.z) * (0.5 - invSamplesMu);
+  float u_mu_s = 0.5 * invSamplesMuS +
+    (atan(max(muSun, -0.1975) * tan(1.386)) * 0.9090909090909090 + 0.74) * 0.5 * (1.0 - invSamplesMuS);
+  float lerp = (nu + 1.0) / 2.0 * (float(SAMPLES_NU) - 1.0);
   float u_nu = floor(lerp);
   lerp = lerp - u_nu;
 
-  // return texture(table, vec3((u_nu + u_mu_s) / float(SAMPLES_NU), u_mu, u_r)) * (1.0f - lerp) +
-  //   texture(table, vec3((u_nu + u_mu_s + 1.0f) / float(SAMPLES_NU), u_mu, u_r)) * lerp;
-  
-  return texture(table, vec3((u_nu + u_mu_s) * invSamplesNu, u_mu, u_r)) * (1.0f - lerp) +
-    texture(table, vec3((u_nu + u_mu_s + 1.0f) * invSamplesNu, u_mu, u_r)) * lerp;
+  return texture(
+    table, vec3((u_nu + u_mu_s) * invSamplesNu, u_mu, u_r)) * (1.0 - lerp) +
+    texture(table, vec3((u_nu + u_mu_s + 1.0) * invSamplesNu, u_mu, u_r)) * lerp;
 }
 
-// -- Given the irradiance texture table, the cosine of zenith sun vector
-// and the height of the observer (ray's stating point x), calculates the
-// mapping for u_r and u_muSun and returns the value in the LUT. --
+// Given the irradiance texture table, the cosine of zenith sun vector and the height of
+// the observer (ray's stating point x), calculates the mapping for u_r and u_muSun and
+// returns the value in the LUT
 // lut   := OpenGL texture2D sampler (the irradiance texture deltaE)
 // muSun := cosine of the zeith angle of vec(s). Or muSun = (vec(s) * vec(v))
 // r     := height of starting point vect(x)
 vec3 irradianceLUT(sampler2D lut, float muSun, float r) {
   // See Bruneton paper and Coliene to understand the mapping
-  float u_muSun = (muSun + 0.2f) / (1.0f + 0.2f);
-  float u_r     = (r - Rg) * invRtMinusRg;
+  float u_muSun = (muSun + 0.2) / 1.2;
+  float u_r = (r - Rg) * invRtMinusRg;
   return texture(lut, vec2(u_muSun, u_r)).rgb;
 }
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index 6e7872b129..9be329d940 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -32,40 +32,35 @@
  * Copyright (c) 2008 INRIA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holders nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ *    conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *    of conditions and the following disclaimer in the documentation and/or other
+ *    materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without specific
+ *    prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #version __CONTEXT__
 
 #include "floatoperations.glsl"
-
 #include "atmosphere_common.glsl"
 
-out vec4 renderTarget;
-in vec3 interpolatedNDCPos;
 in vec2 texCoord;
+out vec4 renderTarget;
 
 uniform int nAaSamples;
 uniform int cullAtmosphere;
@@ -81,617 +76,532 @@ uniform dmat4 dModelTransformMatrix;
 uniform dmat4 dSGCTViewToWorldMatrix;
 uniform dmat4 dSgctProjectionToModelTransformMatrix;
 
+uniform vec4 viewport;
+uniform vec2 resolution;
+
 uniform dvec4 dCamPosObj;
 uniform dvec3 sunDirectionObj;
 
 /*******************************************************************************
  ***** ALL CALCULATIONS FOR ECLIPSE ARE IN METERS AND IN WORLD SPACE SYSTEM ****
  *******************************************************************************/
-// JCC: Remove and use dictionary to 
-// decides the number of shadows
+// JCC: Remove and use dictionary to decide the number of shadows
 const uint numberOfShadows = 1;
 
 struct ShadowRenderingStruct {
-        double xu, xp;
-        double rs, rc;
-        dvec3 sourceCasterVec;
-        dvec3 casterPositionVec;
-        bool isShadowing;
+  double xu, xp;
+  double rs, rc;
+  dvec3 sourceCasterVec;
+  dvec3 casterPositionVec;
+  bool isShadowing;
 };
 
 // Eclipse shadow data
-// JCC: Remove and use dictionary to 
-// decides the number of shadows
+// JCC: Remove and use dictionary to decide the number of shadows
 uniform ShadowRenderingStruct shadowDataArray[numberOfShadows];
 uniform int shadows;
 uniform bool hardShadows;
 
-vec4 butterworthFunc(float d, float r, float n) {
-    return vec4(vec3(sqrt(r/(r + pow(d, 2*n)))), 1.0);    
-}
-
-vec4 calcShadow(ShadowRenderingStruct shadowInfoArray[numberOfShadows], dvec3 position,
-                bool ground)
+float calcShadow(ShadowRenderingStruct shadowInfoArray[numberOfShadows], dvec3 position,
+                 bool ground)
 {
-    if (shadowInfoArray[0].isShadowing) {
-        dvec3 pc = shadowInfoArray[0].casterPositionVec - position;
-        dvec3 sc_norm = shadowInfoArray[0].sourceCasterVec;
-        dvec3 pc_proj = dot(pc, sc_norm) * sc_norm;
-        dvec3 d = pc - pc_proj;
-        
-        float length_d = float(length(d));
-        double length_pc_proj = length(pc_proj);
-        
-        float r_p_pi = float(shadowInfoArray[0].rc * (length_pc_proj + shadowInfoArray[0].xp) / shadowInfoArray[0].xp);
-        float r_u_pi = float(shadowInfoArray[0].rc * (shadowInfoArray[0].xu - length_pc_proj) / shadowInfoArray[0].xu);
-        
-        if ( length_d < r_u_pi ) { // umbra            
-            if (ground) {
-              if (hardShadows) {
-                  return vec4(0.2, 0.2, 0.2, 1.0);
-              }
-              else {
-                  return butterworthFunc(length_d, r_u_pi, 2.0);
-              }
-            }
-            else {
-              if (hardShadows) {
-                  return vec4(0.5, 0.5, 0.5, 1.0);
-              }
-              else {
-                  //return vec4(vec3(length_d/r_p_pi), 1.0);
-                  return butterworthFunc(length_d, r_u_pi, 2.0);
-              }
-            }
-        }
-        else if ( length_d < r_p_pi ) {// penumbra
-            if (hardShadows) {
-                return vec4(0.5, 0.5, 0.5, 1.0); 
-            }
-            else {
-                return vec4(vec3(length_d/r_p_pi), 1.0);
-            }
-        }
-    }
-     
-    return vec4(1.0);
-}
+  if (!shadowInfoArray[0].isShadowing) {
+    return 1.0;
+  }
 
-/*******************************************************************************
- ******* ALL CALCULATIONS FOR ATMOSPHERE ARE KM AND IN WORLD SPACE SYSTEM ******
- *******************************************************************************/
-
-struct dRay {
-    dvec4 origin;
-    dvec4 direction;
-};
-
-/* Function to calculate the initial intersection of the eye (camera) ray
- * with the atmosphere.
- * In (all parameters in the same coordinate system and same units):
- * - planet position
- * - ray direction (normalized)
- * - eye position
- * - atmosphere radius
- * Out: true if an intersection happens, false otherwise
- * - inside: true if the ray origin is inside atmosphere, false otherwise
- * - offset: the initial intersection distance from eye position when 
- *           the eye is outside the atmosphere
- * - maxLength : the second intersection distance from eye position when the
- *               eye is outside the atmosphere or the initial (and only) 
- *               intersection of the ray with atmosphere when the eye position
- *               is inside atmosphere.
- */
-bool dAtmosphereIntersection(dvec3 planetPosition, dRay ray, double atmRadius,
-                             out bool inside, out double offset, out double maxLength ) {
-    dvec3  l  = planetPosition - ray.origin.xyz;
-    double s  = dot(l, ray.direction.xyz);
-    double l2 = dot(l, l);
-    double r2 = atmRadius * atmRadius; // avoiding surface acne
-
-    // Ray origin (eye position) is behind sphere
-    if ((s < 0.0) && (l2 > r2)) {
-        inside    = false;
-        offset    = 0.0;
-        maxLength = 0.0;
-        return false;
-    }
-
-    double m2 = l2 - s*s;
-
-    // Ray misses atmospere
-    if (m2 > r2) {
-        inside    = false;
-        offset    = 0.0;
-        maxLength = 0.0;
-        return false;
-    }
-
-    // We already now the ray hits the atmosphere
-
-    // If q = 0.0f, there is only one intersection
-    double q = sqrt(r2 - m2);
-
-    // If l2 < r2, the ray origin is inside the sphere
-    if (l2 > r2) {
-        inside    = false;
-        offset    = s - q;
-        maxLength = s + q;
+  dvec3 pc = shadowInfoArray[0].casterPositionVec - position;
+  dvec3 sc_norm = shadowInfoArray[0].sourceCasterVec;
+  dvec3 pc_proj = dot(pc, sc_norm) * sc_norm;
+  dvec3 d = pc - pc_proj;
+  
+  float length_d = float(length(d));
+  double length_pc_proj = length(pc_proj);
+  
+  float r_p_pi = float(shadowInfoArray[0].rc * (length_pc_proj + shadowInfoArray[0].xp) / shadowInfoArray[0].xp);
+  float r_u_pi = float(shadowInfoArray[0].rc * (shadowInfoArray[0].xu - length_pc_proj) / shadowInfoArray[0].xu);
+  
+  if (length_d < r_u_pi) {
+    // umbra
+    if (hardShadows) {
+      return ground  ?  0.2  :  0.5;
     }
     else {
-        inside    = true;
-        offset    = 0.0;
-        maxLength = s + q;
+      // butterworth function
+      return sqrt(r_u_pi / (r_u_pi + pow(length_d, 4.0)));
     }
-    
-    return true;
+  }
+  else if (length_d < r_p_pi) {
+    // penumbra
+    return hardShadows  ?  0.5  :  length_d / r_p_pi;
+  }
+  else {
+    return 1.0;
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//  ALL CALCULATIONS FOR ATMOSPHERE ARE KM AND IN WORLD SPACE SYSTEM                    //
+//////////////////////////////////////////////////////////////////////////////////////////
+
+struct Ray {
+  dvec3 origin;
+  dvec3 direction;
+};
+
+/*
+ * Function to calculate the initial intersection of the eye (camera) ray with the
+ * atmosphere.
+ * In (all parameters in the same coordinate system and same units):
+ *   - ray direction (normalized)
+ *   - atmosphere radius
+ * Out: true if an intersection happens, false otherwise
+ *   - return: true if the ray origin is inside atmosphere, false otherwise
+ *   - offset: the initial intersection distance from eye position when the eye is outside
+ *             the atmosphere
+ *   - maxLength: the second intersection distance from eye position when the eye is
+ *                outside the atmosphere or the initial (and only) intersection of the ray
+ *                with atmosphere when the eye position is inside atmosphere.
+ */
+bool atmosphereIntersection(Ray ray, double atmRadius, out double offset,
+                            out double maxLength)
+{
+  dvec3 l = -ray.origin;
+  double s = dot(l, ray.direction);
+  double l2 = dot(l, l);
+  double r2 = atmRadius * atmRadius; // avoiding surface acne
+
+  // Ray origin (eye position) is behind sphere
+  if ((s < 0.0) && (l2 > r2)) {
+    offset = 0.0;
+    maxLength = 0.0;
+    return false;
+  }
+
+  double m2 = l2 - s * s;
+
+  // Ray misses atmosphere
+  if (m2 > r2) {
+    offset = 0.0;
+    maxLength = 0.0;
+    return false;
+  }
+
+  // We already now the ray hits the atmosphere
+
+  // If q = 0.0, there is only one intersection
+  double q = sqrt(r2 - m2);
+
+  // If l2 < r2, the ray origin is inside the sphere
+  if (l2 > r2) {
+    offset = s - q;
+    maxLength = s + q;
+  }
+  else {
+    offset = 0.0;
+    maxLength = s + q;
+  }
+  
+  return true;
 }
 
 /*
- * Calculates Intersection Ray by walking through
- * all the graphic pipile transformations in the 
- * opposite direction.
- * Instead of passing through all the pipeline,
- * it starts at NDC from the interpolated
- * positions from the screen quad.
- * This method avoids matrices multiplications
- * wherever is possible.
+ * Calculates Intersection Ray by walking through all the graphic pipeline transformations
+ * in the opposite direction. Instead of passing through all the pipeline, it starts at
+ * NDC from the interpolated positions from the screen quad. This method avoids matrices
+ * multiplications wherever is possible.
  */
-void dCalculateRayRenderableGlobe(out dRay ray, 
-                                  out dvec4 planetPositionObjectCoords, 
-                                  out dvec4 cameraPositionInObject) {
-    dvec4 clipCoords = dvec4(interpolatedNDCPos.xy, 1.0, 1.0);
+Ray calculateRayRenderableGlobe(vec2 st) {
+  vec2 interpolatedNDCPos = (st - 0.5) * 2.0;
+  dvec4 clipCoords = dvec4(interpolatedNDCPos, 1.0, 1.0);
 
-    // Clip to Object Coords
-    dvec4 objectCoords = dSgctProjectionToModelTransformMatrix * clipCoords;
-
-    objectCoords /= objectCoords.w;
-    
-    // Planet Position in Object Space
-    // JCC: Applying the inverse of the model transformation on the object postion in World 
-    // space results in imprecision. 
-    planetPositionObjectCoords = dvec4(0.0, 0.0, 0.0, 1.0);
-
-    // Camera Position in Object Space (in meters)
-    cameraPositionInObject = dCamPosObj;  
-    
-    // ============================
-    // ====== Building Ray ========
-    // Ray in object space (in KM)
-    ray.origin    = cameraPositionInObject * dvec4(0.001, 0.001, 0.001, 1.0);
-    //ray.direction = dvec4(normalize(objectCoords.xyz - cameraPositionInObject.xyz), 0.0);
-    ray.direction = dvec4(normalize((objectCoords.xyz * dvec3(0.001))- ray.origin.xyz), 0.0);
+  // Clip to Object Coords
+  dvec4 objectCoords = dSgctProjectionToModelTransformMatrix * clipCoords;
+  objectCoords /= objectCoords.w;
+  
+  // Building Ray
+  // Ray in object space (in KM)
+  Ray ray;
+  ray.origin = dvec3(dCamPosObj * dvec4(0.001, 0.001, 0.001, 1.0));
+  ray.direction = normalize(objectCoords.xyz * dvec3(0.001) - ray.origin);
+  return ray;
 }
 
 /* 
- * Calculates the light scattering in the view direction comming from other 
- * light rays scattered in the atmosphere.
+ * 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
- * The view direction here is the ray: x + tv, s is the sun direction,
- * r and mu the position and zenith cosine angle as in the paper.
+ * The view direction here is the ray: x + tv, s is the sun direction, r and mu the
+ * position and zenith cosine angle as in the paper.
  * Arguments:
  * x := camera position
  * 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
+ *      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)
  * s := Sun direction (normalized)
  * r := out of ||x|| inside atmosphere (or top of atmosphere)
  * mu := out of cosine of the zenith view angle
- * attenuation := out of transmittance T(x,x0). This will be used later when
- * calculating the reflectance R[L].
+ * attenuation := out of transmittance T(x,x0). This will be used later when calculating
+ *                the reflectance R[L]
  */
-vec3 inscatterRadiance(inout vec3 x, inout float t, inout float irradianceFactor,
-                       vec3 v, vec3 s, out float r, out float mu,
-                       out vec3 attenuation, vec3 fragPosObj, out bool groundHit,
-                       double maxLength, double pixelDepth,
-                       vec4 spaceColor, float sunIntensity) {
+vec3 inscatterRadiance(vec3 x, inout float t, out float irradianceFactor, vec3 v, vec3 s,
+                       out float r, out float mu, out vec3 attenuation, vec3 fragPosObj,
+                       out bool groundHit, double maxLength, double pixelDepth,
+                       vec4 spaceColor, float sunIntensity)
+{
+  const float INTERPOLATION_EPS = 0.004; // precision const from Brunetton
 
-    const float INTERPOLATION_EPS = 0.004f; // precision const from Brunetton
+  vec3 radiance;
+  
+  r = length(x);
+  mu = dot(x, v) / r;
 
-    vec3 radiance;
+  float r2 = r * r;
+  float nu = dot(v, s);
+  float muSun = dot(x, s) / r;
+  float rayleighPhase = rayleighPhaseFunction(nu);
+  float miePhase = miePhaseFunction(nu, mieG);
     
-    r  = length(x);
-    mu = dot(x, v) / r;
+  // 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
+  // the attenuated scattering light from that path in the current path
+  vec4 inscatterRadiance = max(texture4D(inscatterTexture, r, mu, muSun, 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);
+  float invr0 = 1.0 / r0;
+  float muSun0 = dot(fragPosObj, s) * invr0;
+  float mu0 = dot(fragPosObj, v) * invr0;
 
-    float mu2           = mu * mu;
-    float r2            = r * r;
-    float nu            = dot(v, s);
-    float muSun         = dot(x, s) / r;
-    float rayleighPhase = rayleighPhaseFunction(nu);
-    float miePhase      = miePhaseFunction(nu);
-      
-    // 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 the attenuated scattering light from that path in the
-    // current path.
-    vec4 inscatterRadiance = max(texture4D(inscatterTexture, r, mu, muSun, 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
-    vec3  x0     = fragPosObj;
-    float r0     = length(fragPosObj);
-    float invr0  = 1.0/r0;
-    float muSun0 = dot(fragPosObj, s) * invr0;
-    //vec3  x0     = x + float(pixelDepth) * v;      
-    float mu0    = dot(x0, v) * invr0;
+  if ((pixelDepth > INTERPOLATION_EPS) && (pixelDepth < maxLength)) {
+    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(r, mu, t); 
+    
+    // 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        
+    // 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);
+    inscatterRadiance = max(inscatterRadiance - attenuation.rgbr * inscatterFromSurface, 0.0);
 
-    if ((pixelDepth > INTERPOLATION_EPS) && (pixelDepth < maxLength)) {
-        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(r, mu, t); 
-        
-        // 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        
-        // 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);
-        inscatterRadiance = max(inscatterRadiance - attenuation.rgbr * inscatterFromSurface, 0.0);
+    // We set the irradianceFactor to 1.0 so the reflected irradiance will be considered
+    // when calculating the reflected light on the ground.
+    irradianceFactor = 1.0;
+  }
+  else {
+    attenuation = analyticTransmittance(r, mu, t);
+    groundHit = false;
+  }
 
-        // We set the irradianceFactor to 1.0 so the reflected irradiance will be considered
-        // when calculating the reflected light on the ground.
-        irradianceFactor = 1.0;
-    }
-    else {
-        attenuation = analyticTransmittance(r, mu, t);
-        //attenuation = transmittance(r, mu, t); 
-        groundHit = false;
-    }
+  // cos(PI-thetaH) = dist/r
+  // cos(thetaH) = - dist/r
+  // muHorizon = -sqrt(r^2-Rg^2)/r = -sqrt(1-(Rg/r)^2)
+  float muHorizon = -sqrt(1.0 - Rg2 / r2);
 
-    // cos(PI-thetaH) = dist/r
-    // cos(thetaH) = - dist/r
-    // muHorizon = -sqrt(r^2-Rg^2)/r = -sqrt(1-(Rg/r)^2)
-    float muHorizon = -sqrt(1.0f - (Rg2 / r2));
+  // In order to avoid imprecision problems near horizon, we interpolate between two
+  // points: above and below horizon
+  if (abs(mu - muHorizon) < INTERPOLATION_EPS) {
+    // We want an interpolation value close to 1/2, so the contribution of each radiance
+    // value is almost the same or it has a heavy weight if from above or
+    // below horizon
+    float interpolationValue = (mu - muHorizon + INTERPOLATION_EPS) / (2.0 * INTERPOLATION_EPS);
 
-    // In order to avoid imprecision problems near horizon,
-    // we interpolate between two points: above and below horizon
-    if (abs(mu - muHorizon) < INTERPOLATION_EPS) {
-        // We want an interpolation value close to 1/2, so the
-        // contribution of each radiance value is almost the same
-        // or it has a heavy weight if from above or below horizon
-        float interpolationValue = ((mu - muHorizon) + INTERPOLATION_EPS) / (2.0f * INTERPOLATION_EPS);
+    // Above Horizon
+    mu = muHorizon - INTERPOLATION_EPS;
+    // r0  = sqrt(r * r + t * t + 2.0f * r * t * mu);
+    // From cosine law where t = distance between x and x0
+    // r0^2 = r^2 + t^2 - 2 * r * t * cos(PI-theta)
+    // r0  = sqrt(r2 + t2 + 2.0f * r * t * mu);
+    float halfCossineLaw1 = r2 + (t * t);
+    float halfCossineLaw2 = 2.0 * r * t;
+    r0 = sqrt(halfCossineLaw1 + halfCossineLaw2 * 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);
+    vec4 inScatterAboveXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu);
+    // Attention for the attenuation.r value applied to the S_Mie
+    vec4 inScatterAbove = max(inScatterAboveX - attenuation.rgbr * inScatterAboveXs, 0.0);
 
-        //float t2 = t * t;
-              
-        // Above Horizon
-        mu  = muHorizon - INTERPOLATION_EPS;
-        //r0  = sqrt(r * r + t * t + 2.0f * r * t * mu);
-        // From cosine law where t = distance between x and x0
-        // r0^2 = r^2 + t^2 - 2 * r * t * cos(PI-theta)
-        //r0  = sqrt(r2 + t2 + 2.0f * r * t * mu);
-        float halfCossineLaw1 = r2 + (t * t);
-        float halfCossineLaw2 = 2.0f * r * t;
-        r0  = sqrt(halfCossineLaw1 + halfCossineLaw2 * mu);
-        
-        float invr0 = 1.0/r0;
-        // 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) * invr0;
-        
-        vec4 inScatterAboveX  = texture4D(inscatterTexture, r, mu, muSun, nu);
-        vec4 inScatterAboveXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu);
-        // Attention for the attenuation.r value applied to the S_Mie
-        vec4 inScatterAbove = max(inScatterAboveX - attenuation.rgbr * inScatterAboveXs, 0.0f);
+    // Below Horizon
+    mu = muHorizon + INTERPOLATION_EPS;
+    //r0  = sqrt(r2 + t2 + 2.0f * r * t * mu);
+    r0 = sqrt(halfCossineLaw1 + halfCossineLaw2 * mu);
+    
+    mu0 = (r * mu + t) * (1.0 / r0);
+    
+    vec4 inScatterBelowX = texture4D(inscatterTexture, r, mu, muSun, nu);
+    vec4 inScatterBelowXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu);
+    // Attention for the attenuation.r value applied to the S_Mie
+    vec4 inScatterBelow = max(inScatterBelowX - attenuation.rgbr * inScatterBelowXs, 0.0);
 
-        // Below Horizon
-        mu  = muHorizon + INTERPOLATION_EPS;
-        //r0  = sqrt(r2 + t2 + 2.0f * r * t * mu);
-        r0  = sqrt(halfCossineLaw1 + halfCossineLaw2 * mu);
-        invr0 = 1.0/r0;
-        
-        mu0 = (r * mu + t) * invr0;
-        
-        vec4 inScatterBelowX  = texture4D(inscatterTexture, r, mu, muSun, nu);
-        vec4 inScatterBelowXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu);
-        // Attention for the attenuation.r value applied to the S_Mie
-        vec4 inScatterBelow = max(inScatterBelowX - attenuation.rgbr * inScatterBelowXs, 0.0);
+    // Interpolate between above and below inScattering radiance
+    inscatterRadiance = mix(inScatterAbove, inScatterBelow, interpolationValue);
+  }      
 
-        // 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.
-    inscatterRadiance.w *= smoothstep(0.0f, 0.02f, muSun);
-    vec3 inscatterMie    = inscatterRadiance.rgb * inscatterRadiance.a / max(inscatterRadiance.r, 1e-4) *
+  // 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
+  inscatterRadiance.w *= smoothstep(0.0, 0.02, muSun);
+  vec3 inscatterMie =
+      inscatterRadiance.rgb * inscatterRadiance.a / max(inscatterRadiance.r, 1e-4) *
       (betaRayleigh.r / betaRayleigh);
-      
-    radiance = max(inscatterRadiance.rgb * rayleighPhase + inscatterMie * miePhase, 0.0f);    
     
-    // Finally we add the Lsun (all calculations are done with no Lsun so
-    // we can change it on the fly with no precomputations)
-    // return radiance * sunRadiance;
-    vec3 finalScatteringRadiance = radiance * sunIntensity;
-    
-    if (groundHit) {
-        return finalScatteringRadiance;
-    }
-    else {
-        //return ((r-Rg) * invRtMinusRg)*spaceColor.rgb + finalScatteringRadiance;
-        return spaceColor.rgb + finalScatteringRadiance;
-        // return attenuation * spaceColor.rgb +
-        // (vec3(1.0) - attenuation) * finalScatteringRadiance;
-    }    
+  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;
+  
+  if (groundHit) {
+    return finalScatteringRadiance;
+  }
+  else {
+    return spaceColor.rgb + 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.
+ * 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*] 
- * The 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 center of coordiante system, i.e., the planet's position is (0,0,0).
+ * 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 center of coordiante system, i.e., the planet's position is (0,0,0).
  * 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 atmosphere.
+ *      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)
- * r := ||x|| inside atmosphere (or top of atmosphere). r <= Rt here.
  * mu := cosine of the zenith view angle
  * attenuationXtoX0 := transmittance T(x,x0)
  */
-vec3 groundColor(vec3 x, float t, vec3 v, vec3 s, float r,
-                 float mu, vec3 attenuationXtoX0, vec4 groundColor, 
-                 vec3 normal, float irradianceFactor,
-                 float waterReflectance, float sunIntensity)
+vec3 groundColor(vec3 x, float t, vec3 v, vec3 s, vec3 attenuationXtoX0, vec3 groundColor,
+                 vec3 normal, float irradianceFactor, float waterReflectance,
+                 float sunIntensity)
 {
-    vec3 reflectedRadiance = vec3(0.0f);
+  vec3 reflectedRadiance = vec3(0.0);
 
-    // First we obtain the ray's end point on the surface
-    vec3  x0                 = x + t * v;
-    float r0                 = length(x0);
-    // Normal of intersection point.
-    // Normal must be normalized.
-    vec3  n                  = normal;
-    //vec4 groundReflectance = groundColor * vec4(.37);
-    vec4 groundReflectance   = groundColor * 
-        vec4(groundRadianceEmittion, groundRadianceEmittion, groundRadianceEmittion, 1.0f);
+  // First we obtain the ray's end point on the surface
+  float r0 = length(x + t * v);
 
-    // L0 is not included in the irradiance texture.
-    // We first calculate the light attenuation from the top of the atmosphere
-    // to x0.
-    float dotNS = dot(n, s);
-    float muSun = max(dotNS, 0.0f);
+  vec3 groundReflectance = groundColor * groundRadianceEmission;
 
-    // Is direct Sun light arriving at x0? If not, there is no direct light from Sun (shadowed)
-    vec3  transmittanceL0     = muSun < -sqrt(1.0f - (Rg2 / (r0 * r0))) ? 
-                                vec3(0.0f) : transmittanceLUT(r0, muSun);
-    // E[L*] at x0
-    vec3  irradianceReflected = irradiance(irradianceTexture, r0, muSun) * irradianceFactor;
+  // L0 is not included in the irradiance texture.
+  // We first calculate the light attenuation from the top of the atmosphere to x0
+  float dotNS = dot(normal, s);
+  float muSun = max(dotNS, 0.0);
 
-    // R[L0] + R[L*]
-    // vec3 groundRadiance = (dotNS < -0.2f ? groundReflectance.rgb * 15 : groundReflectance.rgb) *
-    //   (muSun * transmittanceL0 + irradianceReflected) * sunIntensity / M_PI;
+  // Is direct Sun light arriving at x0? If not, there is no direct light from Sun (shadowed)
+  vec3 transmittanceL0 =
+    muSun < -sqrt(1.0 - (Rg2 / (r0 * r0)))  ?  vec3(0.0)  :  transmittance(r0, muSun);
 
-    vec3 groundRadiance;
-    vec3 RLStar = (muSun * transmittanceL0 + irradianceReflected) * sunIntensity / M_PI;
-    if (dotNS < 0.05f) {
-        groundRadiance = groundReflectance.rgb * mix(30.0f, 1.0f, smoothstep(-1.0f, 0.05f, dotNS)) * RLStar;
-    }
-    else {
-        groundRadiance = groundReflectance.rgb * RLStar;
-    }
+  // E[L*] at x0
+  vec3 irradianceReflected = irradiance(irradianceTexture, r0, muSun) * irradianceFactor;
 
-    // Specular reflection from sun on oceans and rivers  
-    if ((waterReflectance > 0.1f) && /*(dotNS > -0.2f)*/(muSun > 0.0f)) {
-        vec3  h         = normalize(s - v);
-        // Fresnell Schlick's approximation
-        float fresnel   = 0.02f + 0.98f * pow(1.0f - dot(-v, h), 5.0f);
-        // Walter BRDF approximation
-        float waterBrdf = fresnel * pow(max(dot(h, n), 0.0f), 150.0f);
-        // Adding Fresnell and Water BRDFs approximation to the final surface color
-        // (After adding the sunRadiance and the attenuation of the Sun through atmosphere)
-        groundRadiance += waterReflectance * max(waterBrdf, 0.0f) * transmittanceL0 * sunIntensity;
-    }
-    //return groundRadiance;  
-    // Finally, we attenuate the surface Radiance from the the point x0 to the camera location.
-    reflectedRadiance = attenuationXtoX0 * groundRadiance;    
-      
-    // Returns reflectedRadiance = 0.0 if the ray doesn't hit the ground.
-    return reflectedRadiance;  
+  // R[L0] + R[L*]
+  vec3 RLStar = (muSun * transmittanceL0 + irradianceReflected) * sunIntensity / M_PI;
+  vec3 groundRadiance =
+    dotNS < 0.05 ?
+    groundReflectance * mix(30.0, 1.0, smoothstep(-1.0, 0.05, dotNS)) * RLStar :
+    groundReflectance * RLStar;
+
+  // Specular reflection from sun on oceans and rivers  
+  if ((waterReflectance > 0.1) && (muSun > 0.0)) {
+    vec3 h = normalize(s - v);
+    // Fresnell Schlick's approximation
+    float fresnel = 0.02 + 0.98 * pow(1.0 - dot(-v, h), 5.0);
+    // Walter BRDF approximation
+    float waterBrdf = fresnel * pow(max(dot(h, normal), 0.0), 150.0);
+    // Adding Fresnell and Water BRDFs approximation to the final surface color
+    // after adding the sunRadiance and the attenuation of the Sun through atmosphere
+    groundRadiance += waterReflectance * max(waterBrdf, 0.0) * transmittanceL0 * sunIntensity;
+  }
+
+  // Finally, we attenuate the surface Radiance from the point x0 to the camera location
+  reflectedRadiance = attenuationXtoX0 * groundRadiance;    
+    
+  // Returns reflectedRadiance = 0.0 if the ray doesn't hit the ground.
+  return reflectedRadiance;  
 }
 
 /* 
- * Calculates the Sun color.
- * The 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 center of coordiante system, i.e., the planet's position is (0,0,0).
- * 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 atmosphere.
+ * 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
+ * center of coordiante system, i.e., the planet's position is (0,0,0). Arguments:
  * v := view direction (ray's direction) (normalized)
  * s := Sun direction (normalized)
  * r := ||x|| inside atmosphere (or top of atmosphere). r <= Rt here.
  * mu := cosine of the zenith view angle
  * attenuation := transmittance T(x,x0)
  */
-vec3 sunColor(vec3 x, float t, vec3 v, vec3 s, float r, float mu, float irradianceFactor)
-{
-    vec3 transmittance  = (r <= Rt) ? ( mu < -sqrt(1.0f - Rg2/(r*r)) ? 
-                          vec3(0.0f) : transmittanceLUT(r, mu)) : vec3(1.0f);  
-    // JCC: Change this function to a impostor texture with gaussian decay color weighted
-    // by tge sunRadiance, transmittance and irradianceColor (11/03/2017)                          
-    float sunFinalColor = smoothstep(cos(M_PI / 500.0f), cos(M_PI / 900.0f), dot(v, s)) * 
-                          sunRadiance * (1.0f - irradianceFactor);
+vec3 sunColor(vec3 v, vec3 s, float r, float mu, float irradianceFactor) {
+  vec3 tm = vec3(1.0);
+  if (r <= Rt) {
+    tm = mu < -sqrt(1.0 - Rg2 / (r * r))  ?  vec3(0.0)  :  transmittance(r, mu);
+  }
+  // JCC: Change this function to a impostor texture with gaussian decay color weighted
+  // by the sunRadiance, transmittance and irradianceColor (11/03/2017)                          
+  float sunFinalColor = smoothstep(cos(M_PI / 500.0), cos(M_PI / 900.0), dot(v, s)) * 
+                        sunRadiance * (1.0 - irradianceFactor);
 
-    return transmittance * sunFinalColor;
+  return tm * sunFinalColor;
 }
 
 void main() {
-    if (cullAtmosphere == 0) {
-        vec4 atmosphereFinalColor = vec4(0.0f);
-        int nSamples = 1;
-        
-        // First we determine if the pixel is complex (different fragments on it)
-        bool complex = false;
-        vec4 oldColor, currentColor;
-        vec4 colorTexture;
-        
-        colorTexture = texture(mainColorTexture, texCoord);        
-        
-        // Color from G-Buffer
-        vec4 color = colorTexture;
-        // Ray in object space
-        dRay ray;
-        dvec4 planetPositionObjectCoords = dvec4(0.0);
-        dvec4 cameraPositionInObject     = dvec4(0.0);        
-        
-        // Get the ray from camera to atm in object space
-        dCalculateRayRenderableGlobe(ray, planetPositionObjectCoords, 
-                                    cameraPositionInObject);
-        
-        bool  insideATM    = false;
-        double offset      = 0.0;   // in Km
-        double maxLength   = 0.0;   // in Km  
+  // Modify the texCoord based on the Viewport and Resolution. This modification is
+  // necessary in case of side-by-side stereo as we only want to access the part of the
+  // feeding texture that we are currently responsible for.  Otherwise we would map the
+  // entire feeding texture into our half of the result texture, leading to a doubling
+  // of the "missing" half.  If you don't believe me, load a configuration file with the
+  // side_by_side stereo mode enabled, disable FXAA, and remove this modification.
+  // The same calculation is done in the FXAA shader and the HDR resolving
+  vec2 st = texCoord;
+  st.x = st.x / (resolution.x / viewport[2]) + (viewport[0] / resolution.x);
+  st.y = st.y / (resolution.y / viewport[3]) + (viewport[1] / resolution.y);
 
-        bool  intersectATM = false;
+  if (cullAtmosphere == 1) {
+    renderTarget = texture(mainColorTexture, st);
+    return;
+  }
 
-        intersectATM = dAtmosphereIntersection(planetPositionObjectCoords.xyz, ray,  
-                                                Rt - (ATM_EPSILON * 0.001), insideATM, offset, maxLength);
-            
-        if ( intersectATM ) {
-            // Now we check is if the atmosphere is occluded, i.e., if the distance to the pixel 
-            // in the G-Buffer positions is less than the distance to the atmosphere then the atmosphere
-            // is occluded
-            // Fragments positions into G-Buffer are written in SGCT Eye Space (View plus Camera Rig Coords)
-            // when using their positions later, one must convert them to the planet's coords
-            
-            // =======================
-            // Get data from G-Buffer
-            // =======================
+  vec4 atmosphereFinalColor = vec4(0.0);
+  int nSamples = 1;
+  
+  // Color from G-Buffer
+  vec4 color = texture(mainColorTexture, st);
+  
+  // 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);
+  if (!intersect) {
+    renderTarget = color;
+    return;
+  }
 
-            // Normal is stored in SGCT View Space and transformed to the current object space
-            vec4 normalViewSpaceAndWaterReflectance = texture(mainNormalTexture, texCoord);
-            dvec4 normalViewSpace = vec4(normalViewSpaceAndWaterReflectance.xyz, 0.0);
-            dvec4 normalWorldSpace = dSGCTViewToWorldMatrix * normalViewSpace;
-            vec4 normal = vec4(dInverseModelTransformMatrix * normalWorldSpace);
-            normal.xyz = normalize(normal.xyz);
-            normal.w = normalViewSpaceAndWaterReflectance.w;
+  // Now we check is if the atmosphere is occluded, i.e., if the distance to the pixel in
+  // the G-Buffer positions is less than the distance to the atmosphere then the
+  // atmosphere is occluded. Fragments positions into G-Buffer are written in SGCT Eye
+  // Space (View plus Camera Rig Coords) when using their positions later, one must
+  // convert them to the planet's coords
 
-            // Data in the mainPositionTexture are written in view space (view plus camera rig)
-            vec4 position = texture(mainPositionTexture, texCoord);
+  //        
+  // Get data from G-Buffer
 
-            // OS Eye to World coords                
-            dvec4 positionWorldCoords = dSGCTViewToWorldMatrix * position;
+  // Normal is stored in SGCT View Space and transformed to the current object space
+  vec4 normalViewSpaceAndWaterReflectance = texture(mainNormalTexture, st);
+  dvec4 normalViewSpace = vec4(normalViewSpaceAndWaterReflectance.xyz, 0.0);
+  dvec4 normalWorldSpace = dSGCTViewToWorldMatrix * normalViewSpace;
+  vec4 normal = vec4(dInverseModelTransformMatrix * normalWorldSpace);
+  normal.xyz = normalize(normal.xyz);
+  normal.w = normalViewSpaceAndWaterReflectance.w;
 
-            // World to Object (Normal and Position in meters)
-            dvec4 positionObjectsCoords = dInverseModelTransformMatrix * positionWorldCoords;
+  // Data in the mainPositionTexture are written in view space (view plus camera rig)
+  vec4 position = texture(mainPositionTexture, st);
 
-            
-            // Distance of the pixel in the gBuffer to the observer
-            // JCC (12/12/2017): AMD distance function is buggy.
-            //double pixelDepth = distance(cameraPositionInObject.xyz, positionObjectsCoords.xyz);
-            double pixelDepth = length(cameraPositionInObject.xyz - positionObjectsCoords.xyz);
-            
-            // 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.
-            float dC = float(length(cameraPositionInObject.xyz));
-            float x1 = 1e8;
-            if (dC > x1) {
-                pixelDepth     += 1000.0;
-                float alpha     = 1000.0;
-                float beta      = 1000000.0;
-                float x2        = 1e9; 
-                float diffGreek = beta - alpha;
-                float diffDist  = x2 - x1;
-                float varA      = diffGreek/diffDist;
-                float varB      = (alpha - varA * x1);
-                pixelDepth     += double(varA * dC + varB); 
-            }
+  // OS Eye to World coords                
+  dvec4 positionWorldCoords = dSGCTViewToWorldMatrix * position;
 
-            // All calculations are done in Km:
-            pixelDepth                *= 0.001;
-            positionObjectsCoords.xyz *= 0.001;
+  // World to Object (Normal and Position in meters)
+  dvec4 positionObjectsCoords = dInverseModelTransformMatrix * positionWorldCoords;
 
-            if (pixelDepth < offset) {
-                // ATM Occluded - Something in fron of ATM.
-                atmosphereFinalColor += color;
-            }
-            else {
-                // Following paper nomenclature      
-                double t = offset;                  
-                vec3 attenuation;     
+  // Distance of the pixel in the gBuffer to the observer
+  // JCC (12/12/2017): AMD distance function is buggy.
+  //double pixelDepth = distance(cameraPositionInObject.xyz, positionObjectsCoords.xyz);
+  double pixelDepth = length(dCamPosObj.xyz - positionObjectsCoords.xyz);
+  
+  // 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
+  float dC = float(length(dCamPosObj.xyz));
+  const float x1 = 1e8;
+  if (dC > x1) {
+    pixelDepth += 1000.0;
+    const float alpha = 1000.0;
+    const float beta = 1000000.0;
+    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); 
+  }
 
-                // Moving observer from camera location to top atmosphere
-                // If the observer is already inside the atm, offset = 0.0
-                // and no changes at all.
-                vec3  x  = vec3(ray.origin.xyz + t*ray.direction.xyz);
-                float r  = 0.0f;//length(x);
-                vec3  v  = vec3(ray.direction.xyz);
-                float mu = 0.0f;//dot(x, v) / r;
-                vec3  s  = vec3(sunDirectionObj);
-                float tF = float(maxLength - t);
+  // All calculations are done in KM:
+  pixelDepth *= 0.001;
+  positionObjectsCoords.xyz *= 0.001;
 
-                // Because we may move the camera origin to the top of atmosphere 
-                // we also need to adjust the pixelDepth for tdCalculateRayRenderableGlobe' offset so the
-                // next comparison with the planet's ground make sense:
-                pixelDepth -= offset;
-                
-                dvec4 onATMPos           = dModelTransformMatrix * dvec4(x * 1000.0, 1.0);
-                vec4 eclipseShadowATM    = calcShadow(shadowDataArray, onATMPos.xyz, false);            
-                float sunIntensityInscatter = sunRadiance * eclipseShadowATM.x;
+  if (pixelDepth < offset) {
+    // ATM Occluded - Something in front of ATM
+    renderTarget = color;
+    return;
+  }
 
-                float irradianceFactor = 0.0;
+  // Following paper nomenclature      
+  double t = offset;                  
+  vec3 attenuation;     
 
-                bool groundHit = false;
-                vec3 inscatterColor = inscatterRadiance(x, tF, irradianceFactor, v,
-                                                        s, r, mu, attenuation, 
-                                                        vec3(positionObjectsCoords.xyz),
-                                                        groundHit, maxLength, pixelDepth,
-                                                        color, sunIntensityInscatter); 
-                vec3 groundColorV = vec3(0.0);
-                vec3 sunColorV = vec3(0.0);                                                
-                if (groundHit) {
-                    vec4 eclipseShadowPlanet = calcShadow(shadowDataArray, positionWorldCoords.xyz, true);
-                    float sunIntensityGround = sunRadiance * eclipseShadowPlanet.x;
-                    groundColorV = groundColor(x, tF, v, s, r, mu, attenuation,
-                                                color, normal.xyz, irradianceFactor, 
-                                                normal.a, sunIntensityGround);
-                }
-                else {
-                    // In order to get better performance, we are not tracing
-                    // multiple rays per pixel when the ray doesn't intersect
-                    // the ground.
-                    sunColorV = sunColor(x, tF, v, s, r, mu, irradianceFactor); 
-                } 
-                
-                // Final Color of ATM plus terrain:
-                vec4 finalRadiance = vec4(inscatterColor + groundColorV + sunColorV, 1.0);
+  // Moving observer from camera location to top atmosphere. If the observer is already
+  // inside the atm, offset = 0.0 and no changes at all
+  vec3 x = vec3(ray.origin + t * ray.direction);
+  float r = 0.0; // length(x);
+  vec3 v = vec3(ray.direction);
+  float mu = 0.0; // dot(x, v) / r;
+  vec3 s = vec3(sunDirectionObj);
+  float tF = float(maxLength - t);
 
-                atmosphereFinalColor += finalRadiance;
-            }
-        } 
-        else { // no intersection
-            // Buffer color
-            atmosphereFinalColor += color;
-        }           
-        
+  // Because we may move the camera origin to the top of atmosphere we also need to
+  // adjust the pixelDepth for tdCalculateRayRenderableGlobe' offset so the next
+  // comparison with the planet's ground make sense:
+  pixelDepth -= offset;
+  
+  dvec3 onATMPos = (dModelTransformMatrix * dvec4(x * 1000.0, 1.0)).xyz;
+  float eclipseShadowATM = calcShadow(shadowDataArray, onATMPos, false);            
+  float sunIntensityInscatter = sunRadiance * eclipseShadowATM;
 
-        renderTarget = atmosphereFinalColor;
-    } 
-    else { // culling
-        vec4 bColor = texture(mainColorTexture, texCoord);
-        renderTarget = bColor;
-    }
+  float irradianceFactor = 0.0;
+
+  bool groundHit = false;
+  vec3 inscatterColor = inscatterRadiance(x, tF, irradianceFactor, v, s, r, mu,
+    attenuation, vec3(positionObjectsCoords.xyz), groundHit, maxLength, pixelDepth,
+    color, sunIntensityInscatter); 
+  vec3 atmColor = vec3(0.0);
+  if (groundHit) {
+    float eclipseShadowPlanet = calcShadow(shadowDataArray, positionWorldCoords.xyz, true);
+    float sunIntensityGround = sunRadiance * eclipseShadowPlanet;
+    atmColor = groundColor(x, tF, v, s, attenuation, color.rgb, normal.xyz,
+      irradianceFactor, normal.w, sunIntensityGround);
+  }
+  else {
+    // In order to get better performance, we are not tracing multiple rays per pixel
+    // when the ray doesn't intersect the ground
+    atmColor = sunColor(v, s, r, mu, irradianceFactor); 
+  } 
+  
+  // Final Color of ATM plus terrain:
+  vec4 finalRadiance = vec4(inscatterColor + atmColor, 1.0);
+  renderTarget = finalRadiance;
 }
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
index cbe4d8663f..3e350f6e91 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
@@ -26,11 +26,9 @@
 
 layout(location = 0) in vec4 in_position;
 
-out vec3 interpolatedNDCPos;
 out vec2 texCoord;
 
 void main() {
-    texCoord = 0.5 + in_position.xy * 0.5;
-    interpolatedNDCPos       = in_position.xyz;
-    gl_Position              = in_position;
+  texCoord = in_position.xy / 2.0 + 0.5;
+  gl_Position = in_position;
 }
diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl b/modules/atmosphere/shaders/calculation_gs.glsl
similarity index 92%
rename from modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl
rename to modules/atmosphere/shaders/calculation_gs.glsl
index 7cccacb76a..36a7459ee7 100644
--- a/modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl
+++ b/modules/atmosphere/shaders/calculation_gs.glsl
@@ -30,10 +30,10 @@ layout (triangles) in;
 layout (triangle_strip, max_vertices = 3) out;
 
 void main() {
-    for (int n = 0; n < gl_in.length(); ++n) {
-        gl_Position = gl_in[n].gl_Position;
-        gl_Layer    = layer;
-        EmitVertex();
-    }
-    EndPrimitive();
+  for (int n = 0; n < gl_in.length(); ++n) {
+    gl_Position = gl_in[n].gl_Position;
+    gl_Layer = layer;
+    EmitVertex();
+  }
+  EndPrimitive();
 }
diff --git a/modules/atmosphere/shaders/deltaS_calc_vs.glsl b/modules/atmosphere/shaders/calculation_vs.glsl
similarity index 98%
rename from modules/atmosphere/shaders/deltaS_calc_vs.glsl
rename to modules/atmosphere/shaders/calculation_vs.glsl
index 1ca953fe3c..be225fa6a6 100644
--- a/modules/atmosphere/shaders/deltaS_calc_vs.glsl
+++ b/modules/atmosphere/shaders/calculation_vs.glsl
@@ -27,5 +27,5 @@
 layout(location = 0) in vec3 in_position;
 
 void main() {
-    gl_Position = vec4(in_position, 1.0);
+  gl_Position = vec4(in_position, 1.0);
 }
diff --git a/modules/atmosphere/shaders/deltaE_calc_vs.glsl b/modules/atmosphere/shaders/deltaE_calc_vs.glsl
deleted file mode 100644
index d5a1e43e38..0000000000
--- a/modules/atmosphere/shaders/deltaE_calc_vs.glsl
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#version __CONTEXT__
-
-layout(location = 0) in vec3 in_position;
-
-void main() {
-    gl_Position = vec4(in_position, 1.0);
-}
\ No newline at end of file
diff --git a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
index badfa8934d..37bacbe3b9 100644
--- a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
@@ -26,7 +26,7 @@
 
 #include "atmosphere_common.glsl"
 
-out vec4 renderTarget1;
+out vec4 renderTarget;
 
 uniform float r;
 uniform vec4 dhdH;
@@ -38,14 +38,14 @@ uniform sampler3D deltaSMTexture;
 uniform int firstIteraction;
 
 // -- Spherical Coordinates Steps. phi e [0,2PI] and theta e [0, PI]
-const float stepPhi = (2.0f * M_PI) / float(INSCATTER_SPHERICAL_INTEGRAL_SAMPLES);
+const float stepPhi = (2.0 * M_PI) / float(INSCATTER_SPHERICAL_INTEGRAL_SAMPLES);
 const float stepTheta = M_PI / float(INSCATTER_SPHERICAL_INTEGRAL_SAMPLES);
 
-void inscatter(float r, float mu, float muSun, float nu, inout vec3 radianceJ) {
+vec3 inscatter(float r, float mu, float muSun, float nu) {
   // Be sure to not get a cosine or height out of bounds
-  r     = clamp(r, Rg, Rt);
-  mu    = clamp(mu, -1.0f, 1.0f);
-  muSun = clamp(muSun, -1.0f, 1.0f);
+  r = clamp(r, Rg, Rt);
+  mu = clamp(mu, -1.0, 1.0);
+  muSun = clamp(muSun, -1.0, 1.0);
 
   //  s sigma | theta v
   //   \      |      /
@@ -55,9 +55,9 @@ void inscatter(float r, float mu, float muSun, float nu, inout vec3 radianceJ) {
   //       \  |  /    cos(theta) = mu
   //        \ | /     cos(sigma) = muSun
   //         \|/      cos(ni)    = nu
-  float mu2              = mu * mu;
-  float muSun2           = muSun * muSun;
-  float sinThetaSinSigma = sqrt(1.0f - mu2) * sqrt(1.0f - muSun2);
+  float mu2 = mu * mu;
+  float muSun2 = muSun * muSun;
+  float sinThetaSinSigma = sqrt(1.0 - mu2) * sqrt(1.0 - muSun2);
   // cos(sigma + theta) = cos(theta)cos(sigma)-sin(theta)sin(sigma)
   // cos(ni) = nu = mu * muSun - sqrt(1.0f - mu*mu)*sqrt(1.0 - muSun*muSun) // sin(theta) = sqrt(1.0 - mu*mu)
   // Now we make sure the angle between vec(s) and vec(v) is in the right range:
@@ -67,8 +67,8 @@ void inscatter(float r, float mu, float muSun, float nu, inout vec3 radianceJ) {
   // theta is the angle between vec(v) and x
   // cos(PI-theta) = d/r
   // -cos(theta) = sqrt(r*r-Rg*Rg)/r
-  float Rg2        = Rg * Rg;
-  float r2         = r * r;
+  float Rg2 = Rg * Rg;
+  float r2 = r * r;
   float cosHorizon = -sqrt(r2 - Rg2)/r;
 
   // Now we get vec(v) and vec(s) from mu, muSun and nu:
@@ -80,7 +80,7 @@ void inscatter(float r, float mu, float muSun, float nu, inout vec3 radianceJ) {
   // sin(PI-theta) = x/||v|| => x = sin(theta) =? x = sqrt(1-mu*mu)
   // cos(PI-theta) = z/||v|| => z = cos(theta) = mu
   // v.y = 0 because ||v|| = 1
-  vec3 v   = vec3(sqrt(1.0 - mu2), 0.0, mu);
+  vec3 v = vec3(sqrt(1.0 - mu2), 0.0, mu);
 
   // To obtain vec(s), we use the following properties:
   // ||vec(s)|| = 1, ||vec(v)|| = 1
@@ -89,7 +89,7 @@ void inscatter(float r, float mu, float muSun, float nu, inout vec3 radianceJ) {
   // So, from vec(s) dot vec(v) = cos(ni) = nu we have,
   // s.x*v.x +s.y*v.y + s.z*v.z = nu
   // s.x = (nu - s.z*v.z)/v.x = (nu - mu*muSun)/v.x
-  float sx = (v.x == 0.0) ? 0.0 : (nu - muSun * mu) / v.x;
+  float sx = (v.x == 0.0)  ?  0.0  :  (nu - muSun * mu) / v.x;
   // Also, ||vec(s)|| = 1, so:
   // 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)
@@ -97,21 +97,21 @@ void inscatter(float r, float mu, float muSun, float nu, inout vec3 radianceJ) {
   
   // In order to integrate over 4PI, we scan the sphere using the spherical coordinates
   // previously defined
-  for (int theta_i = 0; theta_i < INSCATTER_SPHERICAL_INTEGRAL_SAMPLES; ++theta_i) {
-    float theta               = (float(theta_i) + 0.5f) * stepTheta;
-    float cosineTheta         = cos(theta);
-    float cosineTheta2        = cosineTheta * cosineTheta;
-    float distanceToGround    = 0.0f;
-    float groundReflectance   = 0.0f;
-    vec3  groundTransmittance = vec3(0.0f);
+  for (int theta_i = 0; theta_i < INSCATTER_SPHERICAL_INTEGRAL_SAMPLES; theta_i++) {
+    float theta = (float(theta_i) + 0.5) * stepTheta;
+    float cosineTheta = cos(theta);
+    float cosineTheta2 = cosineTheta * cosineTheta;
+    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
+    if (cosineTheta < cosHorizon) { // ray hits ground
       // AverageGroundReflectance e [0,1]
       groundReflectance = AverageGroundReflectance / M_PI;
       // From cosine law: Rg*Rg = r*r + distanceToGround*distanceToGround - 2*r*distanceToGround*cos(PI-theta)
-      distanceToGround = -r * cosineTheta - sqrt(r2 * (cosineTheta2 - 1.0f) + Rg2);
+      distanceToGround = -r * cosineTheta - sqrt(r2 * (cosineTheta2 - 1.0) + Rg2);
       //               |
       //               | theta
       //               |
@@ -125,86 +125,84 @@ void inscatter(float r, float mu, float muSun, float nu, inout vec3 radianceJ) {
       //    cos(alpha) = (-r*distG*cos(theta) - distG*distG)/(Rg*distG)
       //      muGround = -(r*cos(theta) + distG)/Rg
       float muGround = -(r * cosineTheta + distanceToGround) / Rg;
-      // We can use the same triangle in calculate the distanceToGround to calculate the cosine of the
-      // angle between the ground touching point at height Rg and the zenith angle
-      //float muGround = (r2 - distanceToGround*distanceToGround - Rg2)/(2*distanceToGround*Rg);
-      // Acesss the Transmittance LUT in order to calculate the transmittance from the ground point Rg,
-      // thorugh the atmosphere, at a distance: distanceToGround
+      // We can use the same triangle in calculate the distanceToGround to calculate the
+      // cosine of the angle between the ground touching point at height Rg and the zenith
+      // angle
+      // float muGround = (r2 - distanceToGround*distanceToGround - Rg2)/(2*distanceToGround*Rg);
+      // Access the Transmittance LUT in order to calculate the transmittance from the
+      // ground point Rg, thorugh the atmosphere, at a distance: distanceToGround
       groundTransmittance = transmittance(Rg, muGround, distanceToGround);
     }
-    //for ( int phi_i = 0; phi_i < 2*INSCATTER_SPHERICAL_INTEGRAL_SAMPLES; ++phi_i ) {
+
     for (int phi_i = 0; phi_i < INSCATTER_SPHERICAL_INTEGRAL_SAMPLES; ++phi_i) {
-      float phi   = (float(phi_i) + 0.5) * stepPhi;
+      float phi = (float(phi_i) + 0.5) * stepPhi;
       // spherical coordinates: dw = dtheta*dphi*sin(theta)*rho^2
       // rho = 1, we are integrating over a unit sphere
-      float dw    = stepTheta * stepPhi * sin(theta);
+      float dw = stepTheta * stepPhi * sin(theta);
       // w = (rho*sin(theta)*cos(phi), rho*sin(theta)*sin(phi), rho*cos(theta))
-      float sinPhi   = sin(phi);
+      float sinPhi = sin(phi);
       float sinTheta = sin(theta);
-      float cosPhi   = cos(phi);
-      vec3  w        = vec3(sinTheta * cosPhi, sinTheta * sinPhi, cosineTheta);
+      float cosPhi = cos(phi);
+      vec3 w = vec3(sinTheta * cosPhi, sinTheta * sinPhi, cosineTheta);
 
       // We calculate the Rayleigh and Mie phase function for the new scattering angle:
       // cos(angle between vec(v) and vec(w)), ||v|| = ||w|| = 1
-      float nuWV            = dot(v, w);
+      float nuWV = dot(v, w);
       float phaseRayleighWV = rayleighPhaseFunction(nuWV);
-      float phaseMieWV      = miePhaseFunction(nuWV);
+      float phaseMieWV = miePhaseFunction(nuWV, mieG);
       
-      vec3 groundNormal     = (vec3(0.0, 0.0, r) + distanceToGround * w) / Rg;
+      vec3 groundNormal = (vec3(0.0, 0.0, r) + distanceToGround * w) / Rg;
       vec3 groundIrradiance = irradianceLUT(deltaETexture, dot(groundNormal, s), Rg);
 
-      // We finally calculate the radiance from the reflected ray from ground (0.0 if not reflected)
+      // We finally calculate the radiance from the reflected ray from ground
+      // (0.0 if not reflected)
       vec3 radianceJ1 = groundTransmittance * groundReflectance * groundIrradiance;
 
       // We calculate the Rayleigh and Mie phase function for the new scattering angle:
       // cos(angle between vec(s) and vec(w)), ||s|| = ||w|| = 1
       float nuSW = dot(s, w);
-      // The first iteraction is different from the others, that's because in the first
-      // iteraction all the light InScattered are coming from the initial pre-computed
-      // single InScattered 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 ( firstIteraction == 1 ) {        
+      // The first iteraction is different from the others. In the first iteraction all
+      // the light InScattered is coming from the initial pre-computed single InScattered
+      // 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 (firstIteraction == 1) {        
         float phaseRaySW = rayleighPhaseFunction(nuSW);
-        float phaseMieSW = miePhaseFunction(nuSW);
+        float phaseMieSW = miePhaseFunction(nuSW, mieG);
         // We can now access the values for the single InScattering in the textures deltaS textures.
-        vec3  singleRay = texture4D(deltaSRTexture, r, w.z, muSun, nuSW).rgb;
-        vec3  singleMie = texture4D(deltaSMTexture, r, w.z, muSun, nuSW).rgb;
+        vec3 singleRay = texture4D(deltaSRTexture, r, w.z, muSun, nuSW).rgb;
+        vec3 singleMie = texture4D(deltaSMTexture, r, w.z, muSun, nuSW).rgb;
 
         // Initial InScattering including the phase functions
         radianceJ1 += singleRay * phaseRaySW + singleMie * phaseMieSW;        
       }
       else {
-        // On line 9 of the algorithm, the texture table deltaSR is updated, so when we are not in the first
-        // iteraction, we are getting the updated result of deltaSR (not the single inscattered light but the
-        // accumulated (higher order) inscattered light.
+        // On line 9 of the algorithm, the texture table deltaSR is updated, so when we
+        // are not in the first iteraction, we are getting the updated result of deltaSR
+        // (not the single inscattered light but the accumulated (higher order)
+        // inscattered light.
         // w.z is the cosine(theta) = mu for vec(w)
         radianceJ1 += texture4D(deltaSRTexture, r, w.z, muSun, nuSW).rgb;
       }
 
-      // Finally, we add the atmospheric scale height (See: Radiation Transfer on the Atmosphere and Ocean from
-      // Thomas and Stamnes, pg 9-10.
-      radianceJ += radianceJ1 * (betaRayleigh * exp(-(r - Rg) / HR) * phaseRayleighWV +
-                                 betaMieScattering * exp(-(r - Rg) / HM) * phaseMieWV) * dw;        
+      // Finally, we add the atmospheric scale height (See: Radiation Transfer on the
+      // Atmosphere and Ocean from Thomas and Stamnes, pg 9-10.
+      return radianceJ1 * (betaRayleigh * exp(-(r - Rg) / HR) * phaseRayleighWV +
+        betaMieScattering * exp(-(r - Rg) / HM) * phaseMieWV) * dw;        
     }
   }
 }
 
 void main() {
-  // cosine variables to access deltaS textures
+  // InScattering Radiance to be calculated at different points in the ray path
+  // Unmapping the variables from texture texels coordinates to mapped coordinates
   float mu, muSun, nu;
-  // InScattering Radiance to be calculated at
-  // different points in the ray path
-  vec3 radianceJ = vec3(0.0f);
-
-  // Unmapping the variables from texture texels coordinates
-  // to mapped coordinates
   unmappingMuMuSunNu(r, dhdH, mu, muSun, nu);
 
   // Calculate the the light inScattered in direction
   // -vec(v) for the point at height r (vec(y) following Bruneton and Neyret's paper
-  inscatter(r, mu, muSun, nu, radianceJ);
+  vec3 radianceJ = inscatter(r, mu, muSun, nu);
 
   // Write to texture detaJ
-  renderTarget1 = vec4(radianceJ, 1.0);
+  renderTarget = vec4(radianceJ, 1.0);
 }
diff --git a/modules/atmosphere/shaders/deltaJ_calc_gs.glsl b/modules/atmosphere/shaders/deltaJ_calc_gs.glsl
deleted file mode 100644
index aea1c7db4d..0000000000
--- a/modules/atmosphere/shaders/deltaJ_calc_gs.glsl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#version __CONTEXT__
-
-uniform int layer;
-
-layout (triangles) in;
-layout (triangle_strip, max_vertices = 3) out;
-
-void main() {
-    for (int n = 0; n < gl_in.length(); ++n) {
-        gl_Position = gl_in[n].gl_Position;
-        gl_Layer    = layer;
-        EmitVertex();
-    }
-    EndPrimitive();
-}
diff --git a/modules/atmosphere/shaders/deltaJ_calc_vs.glsl b/modules/atmosphere/shaders/deltaJ_calc_vs.glsl
deleted file mode 100644
index d5a1e43e38..0000000000
--- a/modules/atmosphere/shaders/deltaJ_calc_vs.glsl
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#version __CONTEXT__
-
-layout(location = 0) in vec3 in_position;
-
-void main() {
-    gl_Position = vec4(in_position, 1.0);
-}
\ No newline at end of file
diff --git a/modules/atmosphere/shaders/deltaS_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
index d337cb18bf..b5d7de5e79 100644
--- a/modules/atmosphere/shaders/deltaS_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
@@ -26,24 +26,21 @@
 
 #include "atmosphere_common.glsl"
 
-out vec4 renderTarget1;
+out vec4 renderTarget;
 
 uniform int layer;
-
 uniform sampler3D deltaSRTexture;
 uniform sampler3D deltaSMTexture;
 
 void main() {
-  // First we convert the window's fragment coordinate to
-  // texel coordinates
-  vec3 rst = vec3(gl_FragCoord.xy, float(layer) + 0.5f) /
+  // 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));
   
-  vec4 rayleighInscattering0 = texture(deltaSRTexture, rst);
-  vec4 mieInscattering0      = texture(deltaSMTexture, rst);
+  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. 
-  renderTarget1 = vec4(rayleighInscattering0.rgb, mieInscattering0.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); 
 }
diff --git a/modules/atmosphere/shaders/deltaS_calc_gs.glsl b/modules/atmosphere/shaders/deltaS_calc_gs.glsl
deleted file mode 100644
index aea1c7db4d..0000000000
--- a/modules/atmosphere/shaders/deltaS_calc_gs.glsl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#version __CONTEXT__
-
-uniform int layer;
-
-layout (triangles) in;
-layout (triangle_strip, max_vertices = 3) out;
-
-void main() {
-    for (int n = 0; n < gl_in.length(); ++n) {
-        gl_Position = gl_in[n].gl_Position;
-        gl_Layer    = layer;
-        EmitVertex();
-    }
-    EndPrimitive();
-}
diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
index 31e6b6670f..ebe63b5071 100644
--- a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
@@ -26,20 +26,21 @@
 
 #include "atmosphere_common.glsl"
 
-out vec4 renderTarget1;
+out vec4 renderTarget;
 
 uniform int layer;
-
 uniform sampler3D deltaSTexture;
 
 void main() {
-    float x = gl_FragCoord.x - 0.5f;
-    float y = gl_FragCoord.y - 0.5f;
+  vec2 p = gl_FragCoord.xy - vec2(0.5);
 
-    float nu = -1.0f + floor(x / float(SAMPLES_MU_S)) / (float(SAMPLES_NU) - 1.0f) * 2.0f;
-    vec3 uvw = vec3(gl_FragCoord.xy, float(layer) + 0.5f) / vec3(ivec3(SAMPLES_MU_S * SAMPLES_NU, SAMPLES_MU, SAMPLES_R));
+  float nu = -1.0 + floor(p.x / float(SAMPLES_MU_S)) / (float(SAMPLES_NU) - 1.0) * 2.0;
+  vec3 uvw = vec3(
+    gl_FragCoord.xy,
+    float(layer) + 0.5) / vec3(ivec3(SAMPLES_MU_S * SAMPLES_NU, SAMPLES_MU, SAMPLES_R)
+  );
 
-    // See Bruneton and Neyret paper, "Angular Precision" paragraph to understanding why we are
-    // dividing the S[L*] by the Rayleigh phase function.
-    renderTarget1 = vec4(texture(deltaSTexture, uvw).rgb / rayleighPhaseFunction(nu), 0.0f);
+  // See Bruneton and Neyret paper, "Angular Precision" paragraph to understanding why we
+  // are dividing the S[L*] by the Rayleigh phase function.
+  renderTarget = vec4(texture(deltaSTexture, uvw).rgb / rayleighPhaseFunction(nu), 0.0);
  }
diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl
deleted file mode 100644
index 7cccacb76a..0000000000
--- a/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl
+++ /dev/null
@@ -1,39 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
- 
-#version __CONTEXT__
-
-uniform int layer;
-
-layout (triangles) in;
-layout (triangle_strip, max_vertices = 3) out;
-
-void main() {
-    for (int n = 0; n < gl_in.length(); ++n) {
-        gl_Position = gl_in[n].gl_Position;
-        gl_Layer    = layer;
-        EmitVertex();
-    }
-    EndPrimitive();
-}
diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl
deleted file mode 100644
index deb9073c8f..0000000000
--- a/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
- 
-#version __CONTEXT__
-
-layout(location = 0) in vec3 in_position;
-
-void main() {
-    gl_Position = vec4(in_position, 1.0);
-}
diff --git a/modules/atmosphere/shaders/inScattering_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
index be7281bda3..8443cb1109 100644
--- a/modules/atmosphere/shaders/inScattering_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
@@ -21,6 +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"
@@ -31,64 +32,59 @@ layout(location = 1) out vec4 renderTarget2;
 uniform float r;
 uniform vec4 dhdH;
 
-//uniform sampler2D transmittanceTexture;
-
-void integrand(float r, float mu, float muSun, float nu, 
-               float y, out vec3 S_R, out vec3 S_M) {
+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:
   // S[L0] = P_M*S_M[L0] + P_R*S_R[L0]
   // where S_M[L0] = T*(betaMScattering * exp(-h/H_M))*L0 and
   // S_R[L0] = T*(betaRScattering * exp(-h/H_R))*L0.
   // T = transmittance.
-  // One must remember that because the occlusion on L0, the integrand
-  // here will be equal to 0 in that cases.
-  // Also it is important to remember that the phase function for the
-  // Rayleigh and Mie scattering are added during the rendering time
-  // to increase the angular precision
+  // One must remember that because the occlusion on L0, the integrand here will be equal
+  // to 0 in that cases. Also it is important to remember that the phase function for the
+  // Rayleigh and Mie scattering are added during the rendering time to increase the
+  // 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.
+  // 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
   float muSun_i = (nu * y + muSun * r) / ri;
 
-  // If the muSun_i is smaller than the angle to horizon (no sun radiance
-  // hitting the point y), we return S_R = S_M = 0.0f.
+  // If the muSun_i is smaller than the angle to horizon (no sun radiance hitting the
+  // point y), we return S_R = S_M = 0.0.
   if (muSun_i >= -sqrt(1.0 - Rg * Rg / (ri * ri))) {
-    // It's the transmittance from the point y (ri) to the top of atmosphere
-    // in direction of the sun (muSun_i) and the transmittance from the observer
-    // at x (r) to y (ri).
-    vec3 transmittanceY = transmittance(r, mu, y) * transmittanceLUT(ri, muSun_i);
+    // It's the transmittance from the point y (ri) to the top of atmosphere in direction
+    // of the sun (muSun_i) and the transmittance from the observer at x (r) to y (ri).
+    vec3 transmittanceY = transmittance(r, mu, y) * transmittance(ri, muSun_i);
     // exp(-h/H)*T(x,v)
     if (ozoneLayerEnabled) {
-      S_R = (exp(-(ri - Rg) / HO) + exp( -(ri - Rg) / HR )) * transmittanceY;
-      S_M = exp( -(ri - Rg) / HM ) * transmittanceY;
+      S_R = (exp(-(ri - Rg) / HO) + exp(-(ri - Rg) / HR)) * transmittanceY;
+      S_M = exp(-(ri - Rg) / HM) * transmittanceY;
     }
     else {
-      S_R = exp( -(ri - Rg) / HR ) * transmittanceY;
-      S_M = exp( -(ri - Rg) / HM ) * transmittanceY;
+      S_R = exp(-(ri - Rg) / HR) * transmittanceY;
+      S_M = exp(-(ri - Rg) / HM) * transmittanceY;
     }
     // The L0 (sun radiance) is added in real-time.
   }
 }
 
 void inscatter(float r, float mu, float muSun, float nu, out vec3 S_R, out vec3 S_M) {
-  // Let's calculate S_M and S_R by integration along the eye ray path inside
-  // the atmosphere, given a position r, a view angle (cosine) mu, a sun
-  // position angle (cosine) muSun, and the angle (cosine) between the sun position
-  // and the view direction, nu.
-  // Integrating using the Trapezoidal rule:
+  // Let's calculate S_M and S_R by integration along the eye ray path inside the
+  // atmosphere, given a position r, a view angle (cosine) mu, a sun position angle
+  // (cosine) muSun, and the angle (cosine) between the sun position and the view
+  // direction, nu. Integrating using the Trapezoidal rule:
   // Integral(f(y)dy)(from a to b) = (b-a)/2n_steps*(Sum(f(y_i+1)+f(y_i)))
-  S_R = vec3(0.0f);
-  S_M = vec3(0.0f);
+  S_R = vec3(0.0);
+  S_M = vec3(0.0);
+
   float rayDist = rayDistance(r, mu);
-  float dy =  rayDist / float(INSCATTER_INTEGRAL_SAMPLES);
-  float yi = 0.0f;
+  float dy = rayDist / float(INSCATTER_INTEGRAL_SAMPLES);
   vec3 S_Ri;
   vec3 S_Mi;
   integrand(r, mu, muSun, nu, 0.0, S_Ri, S_Mi);
@@ -99,38 +95,33 @@ void inscatter(float r, float mu, float muSun, float nu, out vec3 S_R, out vec3
     integrand(r, mu, muSun, nu, yj, S_Rj, S_Mj);
     S_R += (S_Ri + S_Rj);
     S_M += (S_Mi + S_Mj);
-    yi = yj;
     S_Ri = S_Rj;
     S_Mi = S_Mj;
   }
-  S_R *= betaRayleigh * (rayDist / (2.0f * float(INSCATTER_INTEGRAL_SAMPLES)));
-  S_M *= betaMieScattering * (rayDist / (2.0f * float(INSCATTER_INTEGRAL_SAMPLES)));
+  S_R *= betaRayleigh * (rayDist / (2.0 * float(INSCATTER_INTEGRAL_SAMPLES)));
+  S_M *= betaMieScattering * (rayDist / (2.0 * float(INSCATTER_INTEGRAL_SAMPLES)));
 }
 
 void main() {
   vec3 S_R; // First Order Rayleigh InScattering 
   vec3 S_M; // First Order Mie InScattering
-  float mu, muSun, nu; // parametrization angles
 
-  // From the layer interpolation (see C++ code for layer to r)
-  // and the textures parameters (uv), we unmapping mu, muSun and nu.
+  // From the layer interpolation (see C++ code for layer to r) and the textures
+  // parameters (uv), we unmapping mu, muSun and nu.
+  float mu, muSun, nu;
   unmappingMuMuSunNu(r, dhdH, 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, i.e., the
-  // sun. So, the there is no need to integrate over the
-  // whole solid angle (4pi), we need only to consider
-  // the Sun position (cosine of sun pos = muSun).
-  // Then, following the paper notation:
+  // 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,
+  // i.e., the sun. So, the there is no need to integrate over the whole solid angle
+  // (4pi), we need only to consider the Sun position (cosine of sun pos = muSun). Then,
+  // following the paper notation:
   // S[L] = P_R*S_R[L0] + P_M*S_M[L0] + S[L*]
   // For single inscattering only:
   // 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.
+  // 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.
   inscatter(r, mu, muSun, nu, S_R, S_M);
   renderTarget1 = vec4(S_R, 1.0);
   renderTarget2 = vec4(S_M, 1.0);
diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
index 81377100bc..fd128b3b16 100644
--- a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
@@ -26,23 +26,21 @@
 
 #include "atmosphere_common.glsl"
 
-out vec4 renderTarget1;
+out vec4 renderTarget;
 
 uniform float r;
 uniform vec4 dhdH;
-
-//uniform sampler2D transmittanceTexture;
 uniform sampler3D deltaJTexture;
 
 // The integrand here is the f(y) of the trapezoidal rule:
 vec3 integrand(float r, float mu, float muSun, float nu, float dist) {
   // We can calculate r_i by the cosine law: r_i^2=dist^2 + r^2 - 2*r*dist*cos(PI-theta)
-  float r_i     = sqrt(r * r + dist * dist + 2.0f * r * dist * mu);
+  float r_i = sqrt(r * r + dist * dist + 2.0f * r * dist * mu);
   // r_i can be found using the dot product:
   // vec(y_i) dot vec(dist) = cos(theta_i) * ||vec(y_i)|| * ||vec(dist)||
   // But vec(y_i) = vec(x) + vec(dist), also: vec(x) dot vec(dist) = cos(theta) = mu
   // So, cos(theta_i) = mu_i = (r*dist**mu + dist*2)/(r_i*dist)
-  float mu_i    = (r * mu + dist) / r_i;
+  float mu_i = (r * mu + dist) / r_i;
   // muSun_i can also be found by the dot product:
   // cos(sigma_i) = muSun_i = (vec(s) dot vec(y_i))/(||vec(y_i)|| * ||vec(s)||)
   // But vec(y_i) = vec(x) + vec(dist), and vec(x) dot vec(s) = muSun, cos(sigma_i + theta_i) = nu
@@ -52,28 +50,29 @@ vec3 integrand(float r, float mu, float muSun, float nu, float dist) {
 }
 
 vec3 inscatter(float r, float mu, float muSun, float nu) {
-  vec3  inScatteringRadiance   = vec3(0.0f);
-  float dy                     = rayDistance(r, mu) / float(INSCATTER_INTEGRAL_SAMPLES);
-  vec3  inScatteringRadiance_i = integrand(r, mu, muSun, nu, 0.0);
+  vec3 inScatteringRadiance = vec3(0.0);
+  float dy = rayDistance(r, mu) / 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)))
+  // In order to solve the integral from equation (11) we use the trapezoidal rule:
+  // Integral(f(y)dy)(from a to b) = ((b-a)/2n_steps)*(Sum(f(y_i+1)+f(y_i)))
   // where y_i+1 = y_j
   for (int i = 1; i <= INSCATTER_INTEGRAL_SAMPLES; ++i) {
     float y_j = float(i) * dy;
     vec3 inScatteringRadiance_j = integrand(r, mu, muSun, nu, y_j);
-    inScatteringRadiance  += (inScatteringRadiance_i + inScatteringRadiance_j) / 2.0 * dy;
+    inScatteringRadiance += (inScatteringRadiance_i + inScatteringRadiance_j) / 2.0 * dy;
     inScatteringRadiance_i = inScatteringRadiance_j;
   }
   return inScatteringRadiance;
 }
 
 void main() {
-  float mu = 0.0f, muSunun = 0.0f, nu = 0.0f;
-  // Unmapping the variables from texture texels coordinates
-  // to mapped coordinates
-  unmappingMuMuSunNu(r, dhdH, mu, muSunun, nu);
+  float mu = 0.0;
+  float muSun = 0.0;
+  float nu = 0.0;
+  // Unmapping the variables from texture texels coordinates to mapped coordinates
+  unmappingMuMuSunNu(r, dhdH, mu, muSun, nu);
   
   // Write to texture deltaSR 
-  renderTarget1 = vec4(inscatter(r, mu, muSunun, nu), 1.0);
+  renderTarget = vec4(inscatter(r, mu, muSun, nu), 1.0);
 }
diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl
deleted file mode 100644
index deb9073c8f..0000000000
--- a/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
- 
-#version __CONTEXT__
-
-layout(location = 0) in vec3 in_position;
-
-void main() {
-    gl_Position = vec4(in_position, 1.0);
-}
diff --git a/modules/atmosphere/shaders/irradiance_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_calc_fs.glsl
index 94ea44c834..93fca5128e 100644
--- a/modules/atmosphere/shaders/irradiance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_calc_fs.glsl
@@ -21,23 +21,23 @@
  * 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"
 
 out vec4 renderTableColor;
 
-//uniform sampler2D transmittanceTexture;
-
 void main() {
-  float muSun, r;
-  unmappingRAndMuSun(r, muSun);
-  // We are calculating the Irradiance for L0, i.e.,
-  // only the radiance comming from sun direction is accounted:
+    // See Bruneton and Colliene to understand the mapping
+  float muSun = -0.2 + (gl_FragCoord.x - 0.5) / (float(OTHER_TEXTURES.x) - 1.0) * 1.2;
+  float r = Rg + (gl_FragCoord.y - 0.5) / (float(OTHER_TEXTURES.y) ) * RtMinusRg;
+
+  // We are calculating the Irradiance for L0, i.e., only the radiance coming from Sun
+  // direction is accounted:
   // E[L0](x,s) = L0*dot(w,n) or 0 (if v!=s or the sun is occluded).
-  // Because we consider the Planet as a perfect sphere and we are
-  // considering only single scattering here, the
-  // dot product dot(w,n) is equal to dot(s,n) that is equal to
+  // Because we consider the Planet as a perfect sphere and we are considering only single
+  // scattering here, the dot product dot(w,n) is equal to dot(s,n) that is equal to
   // dot(s, r/||r||) = muSun.
-  renderTableColor = vec4(transmittanceLUT(r, muSun) * max(muSun, 0.0), 0.0);     
+  renderTableColor = vec4(transmittance(r, muSun) * max(muSun, 0.0), 0.0);     
 }
diff --git a/modules/atmosphere/shaders/irradiance_calc_vs.glsl b/modules/atmosphere/shaders/irradiance_calc_vs.glsl
deleted file mode 100644
index 1ca953fe3c..0000000000
--- a/modules/atmosphere/shaders/irradiance_calc_vs.glsl
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#version __CONTEXT__
-
-layout(location = 0) in vec3 in_position;
-
-void main() {
-    gl_Position = vec4(in_position, 1.0);
-}
diff --git a/modules/atmosphere/shaders/irradiance_final_fs.glsl b/modules/atmosphere/shaders/irradiance_final_fs.glsl
index f21d74bdba..5f9834ab2c 100644
--- a/modules/atmosphere/shaders/irradiance_final_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_final_fs.glsl
@@ -31,7 +31,7 @@ out vec4 renderTableColor;
 uniform sampler2D deltaETexture;
 
 void main() {   
-  vec2 uv = gl_FragCoord.xy / vec2(OTHER_TEXTURES_W, OTHER_TEXTURES_H);
+  vec2 uv = gl_FragCoord.xy / vec2(OTHER_TEXTURES);
 
   // Update texture E with E plus deltaE textures.
   renderTableColor = texture(deltaETexture, uv);   
diff --git a/modules/atmosphere/shaders/irradiance_final_vs.glsl b/modules/atmosphere/shaders/irradiance_final_vs.glsl
deleted file mode 100644
index 1ca953fe3c..0000000000
--- a/modules/atmosphere/shaders/irradiance_final_vs.glsl
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#version __CONTEXT__
-
-layout(location = 0) in vec3 in_position;
-
-void main() {
-    gl_Position = vec4(in_position, 1.0);
-}
diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
index 5ac81a7406..06b31090b8 100644
--- a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
@@ -29,60 +29,56 @@
 out vec4 renderTableColor;
 
 uniform int firstIteraction;
-//uniform float firstIteraction;
-
-// -- Spherical Coordinates Steps. phi e [0,2PI] and theta e [0, PI/2]
-const float stepPhi = (2.0f * M_PI) / float(IRRADIANCE_INTEGRAL_SAMPLES);
-const float stepTheta = M_PI / (2.0f * float(IRRADIANCE_INTEGRAL_SAMPLES));
-
-//uniform sampler2D transmittanceTexture;
 uniform sampler3D deltaSRTexture;
 uniform sampler3D deltaSMTexture;
 
+// Spherical Coordinates Steps. phi e [0,2PI] and theta e [0, PI/2]
+const float stepPhi = (2.0 * M_PI) / float(IRRADIANCE_INTEGRAL_SAMPLES);
+const float stepTheta = M_PI / (2.0 * float(IRRADIANCE_INTEGRAL_SAMPLES));
+
 void main() {
-  float r     = 0.0f;
-  float muSun = 0.0f;
-  // Unmapping the variables from texture texels coordinates
-  // to mapped coordinates
-  unmappingRAndMuSunIrradiance(r, muSun);
+    // See Bruneton and Colliene to understand the mapping.
+  float muSun = -0.2 + (gl_FragCoord.x - 0.5) / (float(SKY.x) - 1.0) * 1.2;
+  float r = Rg + (gl_FragCoord.y - 0.5) / (float(SKY.y) - 1.0) * RtMinusRg;
 
   // We know that muSun = cos(sigma) = s.z/||s||
   // But, ||s|| = 1, so s.z = muSun. Also,
   // ||s|| = 1, so s.x = sin(sigma) = sqrt(1-muSun^2) and s.y = 0.0f
-  vec3 s = vec3(max(sqrt(1.0f - muSun * muSun), 0.0f), 0.0f, muSun);
+  vec3 s = vec3(max(sqrt(1.0 - muSun * muSun), 0.0), 0.0, muSun);
 
-  // In order to solve the integral from equation (15) we use the trapezoidal
-  // rule: Integral(f(y)dy)(from a to b) = ((b-a)/2n_steps)*(Sum(f(y_i+1)+f(y_i)))
-  vec3 irradianceE = vec3(0.0f);
+  // In order to solve the integral from equation (15) we use the trapezoidal rule:
+  // Integral(f(y)dy)(from a to b) = ((b-a)/2n_steps)*(Sum(f(y_i+1)+f(y_i)))
+  vec3 irradianceE = vec3(0.0);
   for (int iphi = 0; iphi < IRRADIANCE_INTEGRAL_SAMPLES; ++iphi) {
-    float phi = (float(iphi) + 0.5f) * stepPhi;
+    float phi = (float(iphi) + 0.5) * stepPhi;
     for (int itheta = 0; itheta < IRRADIANCE_INTEGRAL_SAMPLES; ++itheta) {
-      float theta = (float(itheta) + 0.5f) * stepTheta;
+      float theta = (float(itheta) + 0.5) * stepTheta;
       // spherical coordinates: dw = dtheta*dphi*sin(theta)*rho^2
       // rho = 1, we are integrating over a unit sphere
-      float dw    = stepTheta * stepPhi * sin(theta);
+      float dw = stepTheta * stepPhi * sin(theta);
       // w = (cos(phi) * sin(theta) * rho, sin(phi) * sin(theta) * rho, cos(theta) * rho)
-      vec3  w     = vec3(cos(phi) * sin(theta), sin(phi) * sin(theta), cos(theta));
-      float nu    = dot(s, w);
+      vec3 w = vec3(cos(phi) * sin(theta), sin(phi) * sin(theta), cos(theta));
+      float nu = dot(s, w);
 
       // The first iteraction is different from the others, that's because in the first
       // iteraction all the light arriving are coming from the initial pre-computed
-      // single scattered 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).
+      // single scattered 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 (firstIteraction == 1) {
         float phaseRay = rayleighPhaseFunction(nu);
-        float phaseMie = miePhaseFunction(nu);
+        float phaseMie = miePhaseFunction(nu, mieG);
         vec3 singleRay = texture4D(deltaSRTexture, r, w.z, muSun, nu).rgb;
         vec3 singleMie = texture4D(deltaSMTexture, r, w.z, muSun, nu).rgb;
         // w.z is the cosine(theta) = mu for vec(w) and also vec(w) dot vec(n(xo))
         irradianceE += (singleRay * phaseRay + singleMie * phaseMie) * w.z * dw;
       }
       else {
-        // On line 10 of the algorithm, the texture table deltaE is updated, so when we are not in the first
-        // iteraction, we are getting the updated result of deltaE (not the single irradiance light but the
-        // accumulated (higher order) irradiance light.
-        // w.z is the cosine(theta) = mu for vec(w) and also vec(w) dot vec(n(xo))
+        // On line 10 of the algorithm, the texture table deltaE is updated, so when we
+        // are not in the first iteraction, we are getting the updated result of deltaE
+        // (not the single irradiance light but the accumulated (higher order) irradiance
+        // light. w.z is the cosine(theta) = mu for vec(w) and also vec(w) dot vec(n(xo))
         irradianceE += texture4D(deltaSRTexture, r, w.z, muSun, nu).rgb * w.z * dw;
       }
     }
diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl b/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl
deleted file mode 100644
index 1ca953fe3c..0000000000
--- a/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#version __CONTEXT__
-
-layout(location = 0) in vec3 in_position;
-
-void main() {
-    gl_Position = vec4(in_position, 1.0);
-}
diff --git a/modules/atmosphere/shaders/transmittance_calc_fs.glsl b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
index 0c1dddd0ff..cf78347f29 100644
--- a/modules/atmosphere/shaders/transmittance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
@@ -21,33 +21,31 @@
  * 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"
 
-//layout(location = 1) out vec4 renderTableColor;
 out vec4 renderTableColor;
 
-//-- Optical depth by integration, from ray starting at point vec(x), i.e,
-// height r and angle mu (cosine of vec(v)) until top of atmosphere
-// or planet's ground. --
+// Optical depth by integration, from ray starting at point vec(x), i.e, height r and
+// angle mu (cosine of vec(v)) until top of atmosphere or planet's ground.
 // 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 (can be used
-//      for Rayleigh and Mie.
+// H := Thickness of atmosphere if its density were uniform (used for Rayleigh and Mie)
 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.
+  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.0f - ( ( Rg * Rg ) / r2 ) );
-  if (mu < cosZenithHorizon)
+  float cosZenithHorizon = -sqrt(1.0 - (Rg * Rg / r2));
+  if (mu < cosZenithHorizon) {
     return 1e9;
+  }
 
   // Integrating using the Trapezoidal rule:
   // Integral(f(y)dy)(from a to b) = ((b-a)/2n_steps)*(Sum(f(y_i+1)+f(y_i)))
@@ -56,36 +54,39 @@ float opticalDepth(float r, float mu, float H) {
   // cosine law
   float y_i = exp(-(r - Rg) / H);
   
-  float x_step       = 0.0f;
-  float accumulation = 0.0f;
+  float accumulation = 0.0;
   for (int i = 1; i <= TRANSMITTANCE_STEPS; ++i) {
     float x_i = float(i) * deltaStep;
     // cosine law for triangles: y_i^2 = a^2 + b^2 - 2abcos(alpha)
     // In this case, a = r, b = x_i and cos(alpha) = cos(PI-zenithView) = mu
-    float y_ii    = exp(-(sqrt(r2 + x_i * x_i + 2.0 * x_i * r * mu) - Rg) / H);
+    float y_ii = exp(-(sqrt(r2 + x_i * x_i + 2.0 * x_i * r * mu) - Rg) / H);
     accumulation += (y_ii + y_i);
-    //x_step = x_i;
     y_i = y_ii;
   }
-  return accumulation * ( b_a / ( 2 * TRANSMITTANCE_STEPS ) );
+  return accumulation * (b_a / (2.0 * TRANSMITTANCE_STEPS));
 }
 
-
 void main() {
-  float r, muSun;    
-  unmappingRAndMu(r, muSun);
+  float u_mu  = gl_FragCoord.x / float(TRANSMITTANCE.x);
+  float u_r = gl_FragCoord.y / float(TRANSMITTANCE.y);
   
-  vec3 opDepth = vec3(0.0);
+  // 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) * RtMinusRg;
   
+  // 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 Colliene.
+  // One must remember that mu is defined from 0 to PI/2 + epsilon
+  float muSun = -0.15 + tan(1.5 * u_mu) / tan(1.5) * 1.15;
+
+  vec3 ozoneContribution = vec3(0.0);
   if (ozoneLayerEnabled) {
-    opDepth = betaOzoneExtinction * (0.0000006) * opticalDepth(r, muSun, HO) + 
+    ozoneContribution = betaOzoneExtinction * 0.0000006 * opticalDepth(r, muSun, HO);
+  }
+  vec3 opDepth = ozoneContribution + 
     betaMieExtinction * opticalDepth(r, muSun, HM) +
     betaRayleigh * opticalDepth(r, muSun, HR);
-  }
-  else {
-    opDepth = betaMieExtinction * opticalDepth(r, muSun, HM) + 
-    betaRayleigh * opticalDepth(r, muSun, HR);
-  }
   
-  renderTableColor = vec4(exp(-opDepth), 0.0f);
+  renderTableColor = vec4(exp(-opDepth), 0.0);
 }
diff --git a/modules/atmosphere/shaders/transmittance_calc_vs.glsl b/modules/atmosphere/shaders/transmittance_calc_vs.glsl
deleted file mode 100644
index aead855d65..0000000000
--- a/modules/atmosphere/shaders/transmittance_calc_vs.glsl
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#version __CONTEXT__
-
-layout(location = 0) in vec4 in_position;
-
-void main() {
-    gl_Position = in_position;
-}
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index 75e8508b89..4a69424b32 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -50,6 +50,7 @@ set(HEADER_FILES
   rendering/renderableplane.h
   rendering/renderableplaneimagelocal.h
   rendering/renderableplaneimageonline.h
+  rendering/renderableprism.h
   rendering/renderablesphere.h
   rendering/renderabletrail.h
   rendering/renderabletrailorbit.h
@@ -101,6 +102,7 @@ set(SOURCE_FILES
   rendering/renderableplane.cpp
   rendering/renderableplaneimagelocal.cpp
   rendering/renderableplaneimageonline.cpp
+  rendering/renderableprism.cpp
   rendering/renderablesphere.cpp
   rendering/renderabletrail.cpp
   rendering/renderabletrailorbit.cpp
@@ -141,6 +143,8 @@ set(SHADER_FILES
   shaders/model_vs.glsl
   shaders/plane_fs.glsl
   shaders/plane_vs.glsl
+  shaders/prism_fs.glsl
+  shaders/prism_vs.glsl
   shaders/renderabletrail_fs.glsl
   shaders/renderabletrail_vs.glsl
   shaders/screenspace_fs.glsl
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index 883e73cc21..67f2332629 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -51,6 +51,7 @@
 #include <modules/base/rendering/renderabletrailtrajectory.h>
 #include <modules/base/rendering/renderableplaneimagelocal.h>
 #include <modules/base/rendering/renderableplaneimageonline.h>
+#include <modules/base/rendering/renderableprism.h>
 #include <modules/base/rendering/screenspacedashboard.h>
 #include <modules/base/rendering/screenspaceimagelocal.h>
 #include <modules/base/rendering/screenspaceimageonline.h>
@@ -131,6 +132,7 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
     fRenderable->registerClass<RenderableNodeLine>("RenderableNodeLine");
     fRenderable->registerClass<RenderablePlaneImageLocal>("RenderablePlaneImageLocal");
     fRenderable->registerClass<RenderablePlaneImageOnline>("RenderablePlaneImageOnline");
+    fRenderable->registerClass<RenderablePrism>("RenderablePrism");
     fRenderable->registerClass<RenderableRadialGrid>("RenderableRadialGrid");
     fRenderable->registerClass<RenderableSphere>("RenderableSphere");
     fRenderable->registerClass<RenderableSphericalGrid>("RenderableSphericalGrid");
diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index 5034b763dc..1e3ed867d8 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -112,9 +112,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItemAngle::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_dashboarditem_angle";
-    return doc;
+    return codegen::doc<Parameters>("base_dashboarditem_angle");
 }
 
 DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/dashboard/dashboarditemdate.cpp b/modules/base/dashboard/dashboarditemdate.cpp
index 3a1a611f6d..f21b7db78c 100644
--- a/modules/base/dashboard/dashboarditemdate.cpp
+++ b/modules/base/dashboard/dashboarditemdate.cpp
@@ -65,9 +65,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItemDate::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_dashboarditem_date";
-    return doc;
+    return codegen::doc<Parameters>("base_dashboarditem_date");
 }
 
 DashboardItemDate::DashboardItemDate(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index bfb364ad2d..86613fc95c 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -140,9 +140,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItemDistance::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_dashboarditem_distance";
-    return doc;
+    return codegen::doc<Parameters>("base_dashboarditem_distance");
 }
 
 DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index f16db9e6fb..283dcb4a52 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -148,9 +148,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItemFramerate::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_dashboarditem_framerate";
-    return doc;
+    return codegen::doc<Parameters>("base_dashboarditem_framerate");
 }
 
 DashboardItemFramerate::DashboardItemFramerate(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp
index 663ff6d68f..cfec7d6e1f 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.cpp
+++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp
@@ -62,9 +62,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItemPropertyValue::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_dashboarditem_propertyvalue";
-    return doc;
+    return codegen::doc<Parameters>("base_dashboarditem_propertyvalue");
 }
 
 DashboardItemPropertyValue::DashboardItemPropertyValue(
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
index 6648503c41..1dbe386066 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
@@ -101,9 +101,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItemSimulationIncrement::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_dashboarditem_simulationincrement";
-    return doc;
+    return codegen::doc<Parameters>("base_dashboarditem_simulationincrement");
 }
 
 DashboardItemSimulationIncrement::DashboardItemSimulationIncrement(
diff --git a/modules/base/dashboard/dashboarditemspacing.cpp b/modules/base/dashboard/dashboarditemspacing.cpp
index 5b615f769b..83d32c5262 100644
--- a/modules/base/dashboard/dashboarditemspacing.cpp
+++ b/modules/base/dashboard/dashboarditemspacing.cpp
@@ -46,9 +46,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItemSpacing::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_dashboarditem_spacing";
-    return doc;
+    return codegen::doc<Parameters>("base_dashboarditem_spacing");
 }
 
 DashboardItemSpacing::DashboardItemSpacing(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/dashboard/dashboarditemtext.cpp b/modules/base/dashboard/dashboarditemtext.cpp
index 690da61c6a..321c746310 100644
--- a/modules/base/dashboard/dashboarditemtext.cpp
+++ b/modules/base/dashboard/dashboarditemtext.cpp
@@ -50,9 +50,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItemText::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_dashboarditem_text";
-    return doc;
+    return codegen::doc<Parameters>("base_dashboarditem_text");
 }
 
 DashboardItemText::DashboardItemText(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp
index 587e83f4f3..c13782c8aa 100644
--- a/modules/base/dashboard/dashboarditemvelocity.cpp
+++ b/modules/base/dashboard/dashboarditemvelocity.cpp
@@ -83,9 +83,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItemVelocity::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_dashboarditem_velocity";
-    return doc;
+    return codegen::doc<Parameters>("base_dashboarditem_velocity");
 }
 
 DashboardItemVelocity::DashboardItemVelocity(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/lightsource/cameralightsource.cpp b/modules/base/lightsource/cameralightsource.cpp
index d878e5cf45..198fa95906 100644
--- a/modules/base/lightsource/cameralightsource.cpp
+++ b/modules/base/lightsource/cameralightsource.cpp
@@ -46,9 +46,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation CameraLightSource::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_camera_light_source";
-    return doc;
+    return codegen::doc<Parameters>("base_camera_light_source");
 }
 
 CameraLightSource::CameraLightSource()
diff --git a/modules/base/lightsource/scenegraphlightsource.cpp b/modules/base/lightsource/scenegraphlightsource.cpp
index 671f7efd75..5a2d32a39a 100644
--- a/modules/base/lightsource/scenegraphlightsource.cpp
+++ b/modules/base/lightsource/scenegraphlightsource.cpp
@@ -59,9 +59,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation SceneGraphLightSource::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_scene_graph_light_source";
-    return doc;
+    return codegen::doc<Parameters>("base_scene_graph_light_source");
 }
 
 SceneGraphLightSource::SceneGraphLightSource()
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index 9f35f6541b..9f14d86fdc 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -72,9 +72,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableBoxGrid::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_boxgrid";
-    return doc;
+    return codegen::doc<Parameters>("base_renderable_boxgrid");
 }
 
 RenderableBoxGrid::RenderableBoxGrid(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index c79f5785dc..a3065666cf 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -82,9 +82,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableGrid::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_grid";
-    return doc;
+    return codegen::doc<Parameters>("base_renderable_grid");
 }
 
 RenderableGrid::RenderableGrid(const ghoul::Dictionary& dictionary)
@@ -92,7 +90,7 @@ RenderableGrid::RenderableGrid(const ghoul::Dictionary& dictionary)
     , _color(ColorInfo, glm::vec3(0.5f), glm::vec3(0.f), glm::vec3(1.f))
     , _segments(SegmentsInfo, glm::uvec2(10), glm::uvec2(1), glm::uvec2(200))
     , _lineWidth(LineWidthInfo, 0.5f, 1.f, 20.f)
-    , _size(SizeInfo, glm::vec2(1e10f), glm::vec2(1.f), glm::vec2(1e20f))
+    , _size(SizeInfo, glm::vec2(1.f), glm::vec2(1.f), glm::vec2(1e11f))
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
@@ -110,7 +108,7 @@ RenderableGrid::RenderableGrid(const ghoul::Dictionary& dictionary)
     _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
 
-    _size.setViewOption(properties::Property::ViewOptions::Logarithmic);
+    _size.setExponent(10.f);
     _size = p.size.value_or(_size);
     _size.onChange([&]() { _gridIsDirty = true; });
     addProperty(_size);
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index fd2150e178..eda326d974 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -65,17 +65,12 @@ namespace {
         "This value specifies the line width of the spherical grid."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo OuterRadiusInfo = {
-        "OuterRadius",
-        "Outer Radius",
-        "The outer radius of the circular grid, i.e. its size."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo InnerRadiusInfo = {
-        "InnerRadius",
-        "Inner Radius",
-        "The inner radius of the circular grid, that is the radius of the inmost ring. "
-        "Must be smaller than the outer radius."
+    constexpr openspace::properties::Property::PropertyInfo RadiiInfo = {
+        "Radii",
+        "Inner and Outer Radius",
+        "The radii values that determine the size of the circular grid. The first value "
+        "is the radius of the inmost ring and the second is the radius of the outmost "
+        "ring."
     };
 
     struct [[codegen::Dictionary(RenderableRadialGrid)]] Parameters {
@@ -91,11 +86,8 @@ namespace {
         // [[codegen::verbatim(LineWidthInfo.description)]]
         std::optional<float> lineWidth;
 
-        // [[codegen::verbatim(OuterRadiusInfo.description)]]
-        std::optional<float> outerRadius;
-
-        // [[codegen::verbatim(InnerRadiusInfo.description)]]
-        std::optional<float> innerRadius;
+        // [[codegen::verbatim(RadiiInfo.description)]]
+        std::optional<glm::vec2> radii;
     };
 #include "renderableradialgrid_codegen.cpp"
 } // namespace
@@ -103,9 +95,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableRadialGrid::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_radialgrid";
-    return doc;
+    return codegen::doc<Parameters>("base_renderable_radialgrid");
 }
 
 RenderableRadialGrid::RenderableRadialGrid(const ghoul::Dictionary& dictionary)
@@ -114,8 +104,7 @@ RenderableRadialGrid::RenderableRadialGrid(const ghoul::Dictionary& dictionary)
     , _gridSegments(GridSegmentsInfo, glm::ivec2(1), glm::ivec2(1), glm::ivec2(200))
     , _circleSegments(CircleSegmentsInfo, 36, 4, 200)
     , _lineWidth(LineWidthInfo, 0.5f, 1.f, 20.f)
-    , _maxRadius(OuterRadiusInfo, 1.f, 0.f, 20.f)
-    , _minRadius(InnerRadiusInfo, 0.f, 0.f, 20.f)
+    , _radii(RadiiInfo, glm::vec2(0.f, 1.f), glm::vec2(0.f), glm::vec2(20.f))
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
@@ -142,24 +131,11 @@ RenderableRadialGrid::RenderableRadialGrid(const ghoul::Dictionary& dictionary)
     _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
 
-    _minRadius = p.innerRadius.value_or(_minRadius);
-    _maxRadius = p.outerRadius.value_or(_maxRadius);
+    _radii = p.radii.value_or(_radii);
+    _radii.setViewOption(properties::Property::ViewOptions::MinMaxRange);
+    _radii.onChange([&]() { _gridIsDirty = true; });
 
-    _maxRadius.setMinValue(_minRadius);
-    _minRadius.setMaxValue(_maxRadius);
-
-    _maxRadius.onChange([&]() {
-        _gridIsDirty = true;
-        _minRadius.setMaxValue(_maxRadius);
-    });
-
-    _minRadius.onChange([&]() {
-        _gridIsDirty = true;
-        _maxRadius.setMinValue(_minRadius);
-    });
-
-    addProperty(_maxRadius);
-    addProperty(_minRadius);
+    addProperty(_radii);
 }
 
 bool RenderableRadialGrid::isReady() const {
@@ -238,12 +214,15 @@ void RenderableRadialGrid::update(const UpdateData&) {
         return;
     }
 
+    const float innerRadius = _radii.value().x;
+    const float outerRadius = _radii.value().y;
+
     // Circles
     const int nRadialSegments = _gridSegments.value()[0];
     const float fnCircles = static_cast<float>(nRadialSegments);
-    const float deltaRadius = (_maxRadius - _minRadius) / fnCircles;
+    const float deltaRadius = (outerRadius - innerRadius) / fnCircles;
 
-    const bool hasInnerRadius = _minRadius > 0;
+    const bool hasInnerRadius = innerRadius > 0.f;
     const int nCircles = hasInnerRadius ? nRadialSegments : nRadialSegments + 1;
 
     _circles.clear();
@@ -260,11 +239,11 @@ void RenderableRadialGrid::update(const UpdateData&) {
 
     // add an extra inmost circle
     if (hasInnerRadius) {
-        addRing(_circleSegments, _minRadius);
+        addRing(_circleSegments, innerRadius);
     }
 
     for (int i = 0; i < nRadialSegments; ++i) {
-        const float ri = static_cast<float>(i + 1) * deltaRadius + _minRadius;
+        const float ri = static_cast<float>(i + 1) * deltaRadius + innerRadius;
         addRing(_circleSegments, ri);
     }
 
@@ -277,10 +256,10 @@ void RenderableRadialGrid::update(const UpdateData&) {
 
     if (nLines > 1) {
         std::vector<rendering::helper::Vertex> outerVertices =
-            rendering::helper::createRing(nLines, _maxRadius);
+            rendering::helper::createRing(nLines, outerRadius);
 
         std::vector<rendering::helper::Vertex> innerVertices =
-            rendering::helper::createRing(nLines, _minRadius);
+            rendering::helper::createRing(nLines, innerRadius);
 
         for (int i = 0; i < nLines; ++i) {
             const rendering::helper::VertexXYZ vOut =
diff --git a/modules/base/rendering/grids/renderableradialgrid.h b/modules/base/rendering/grids/renderableradialgrid.h
index f719808f3d..0c5b1270e3 100644
--- a/modules/base/rendering/grids/renderableradialgrid.h
+++ b/modules/base/rendering/grids/renderableradialgrid.h
@@ -30,6 +30,7 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/vector/ivec2property.h>
+#include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/rendering/helper.h>
 #include <ghoul/opengl/ghoul_gl.h>
@@ -78,8 +79,7 @@ protected:
     properties::IVec2Property _gridSegments;
     properties::IntProperty _circleSegments;
     properties::FloatProperty _lineWidth;
-    properties::FloatProperty _maxRadius;
-    properties::FloatProperty _minRadius;
+    properties::Vec2Property _radii;
 
     bool _gridIsDirty = true;
 
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index 75a2b27fbf..52485c23af 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -73,9 +73,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableSphericalGrid::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_sphericalgrid";
-    return doc;
+    return codegen::doc<Parameters>("base_renderable_sphericalgrid");
 }
 
 RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index 2a6a985522..9b658ac953 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -75,9 +75,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableCartesianAxes::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_cartesianaxes";
-    return doc;
+    return codegen::doc<Parameters>("base_renderable_cartesianaxes");
 }
 
 RenderableCartesianAxes::RenderableCartesianAxes(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/rendering/renderabledisc.cpp b/modules/base/rendering/renderabledisc.cpp
index ca17160453..52a733131c 100644
--- a/modules/base/rendering/renderabledisc.cpp
+++ b/modules/base/rendering/renderabledisc.cpp
@@ -82,9 +82,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableDisc::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_disc";
-    return doc;
+    return codegen::doc<Parameters>("base_renderable_disc");
 }
 
 RenderableDisc::RenderableDisc(const ghoul::Dictionary& dictionary)
@@ -96,10 +94,10 @@ RenderableDisc::RenderableDisc(const ghoul::Dictionary& dictionary)
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _texturePath = p.texture.string();
-    _texturePath.onChange([&]() { _texture->loadFromFile(_texturePath); });
+    _texturePath.onChange([&]() { _texture->loadFromFile(_texturePath.value()); });
     addProperty(_texturePath);
 
-    _size.setViewOption(properties::Property::ViewOptions::Logarithmic);
+    _size.setExponent(13.f);
     _size = p.size.value_or(_size);
     setBoundingSphere(_size);
     _size.onChange([&]() { _planeIsDirty = true; });
@@ -129,7 +127,7 @@ void RenderableDisc::initialize() {
 void RenderableDisc::initializeGL() {
     initializeShader();
 
-    _texture->loadFromFile(_texturePath);
+    _texture->loadFromFile(_texturePath.value());
     _texture->uploadToGpu();
 
     _plane->initialize();
diff --git a/modules/base/rendering/renderablelabels.cpp b/modules/base/rendering/renderablelabels.cpp
index 42c0ea0ab0..5125e2bed7 100644
--- a/modules/base/rendering/renderablelabels.cpp
+++ b/modules/base/rendering/renderablelabels.cpp
@@ -75,105 +75,78 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = {
         "BlendMode",
         "Blending Mode",
-        "This determines the blending mode that is applied to this plane."
+        "This determines the blending mode that is applied to the renderable."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelColorInfo = {
-        "LabelColor",
-        "Label Color",
-        "The label color for the astronomical object."
+    constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
+        "Color",
+        "Color",
+        "The label text color."
     };
 
     constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = {
         "FontSize",
         "Font Size",
-        "The font size for the astronomical object labels."
+        "The font size (in points) for the label."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelSizeInfo = {
-        "LabelSize",
-        "Label Size",
-        "The label size for the astronomical object labels."
+    constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
+        "Size",
+        "Size",
+        "This value affects the size scale of the label."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelTextInfo = {
-        "LabelText",
-        "Label Text",
+    constexpr openspace::properties::Property::PropertyInfo TextInfo = {
+        "Text",
+        "Text",
         "The text that will be displayed on screen."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelMinSizeInfo = {
-        "LabelMinSize",
-        "Label Min Size",
-        "The minimal size (in pixels) of the labels for the astronomical "
-        "objects being rendered."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo LabelMaxSizeInfo = {
-        "LabelMaxSize",
-        "Label Max Size",
-        "The maximum size (in pixels) of the labels for the astronomical "
-        "objects being rendered."
+    constexpr openspace::properties::Property::PropertyInfo MinMaxSizeInfo = {
+        "MinMaxSize",
+        "Min and Max Size",
+        "The minimum and maximum size (in pixels) of the label."
     };
 
     constexpr openspace::properties::Property::PropertyInfo TransformationMatrixInfo = {
         "TransformationMatrix",
         "Transformation Matrix",
-        "Transformation matrix to be applied to each astronomical object."
+        "Transformation matrix to be applied to the label."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelOrientationOptionInfo = {
-        "LabelOrientationOption",
-        "Label Orientation Option",
+    constexpr openspace::properties::Property::PropertyInfo OrientationOptionInfo = {
+        "OrientationOption",
+        "Orientation Option",
         "Label orientation rendering mode."
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnableFadingEffectInfo = {
         "EnableFading",
-        "Enable/Disable Fade-in effect",
+        "Enable/Disable Fade-in Effect",
         "Enable/Disable the Fade-in effect."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo PixelSizeControlInfo = {
-        "EnablePixelSizeControl",
-        "Enable pixel size control.",
-        "Enable pixel size control for rectangular projections."
+    constexpr openspace::properties::Property::PropertyInfo FadeWidthsInfo = {
+        "FadeWidths",
+        "Fade Widths",
+        "The distances over which the fading takes place, given in the specified unit. "
+        "The first value is the distance before the closest distance and the second "
+        "the one after the furthest distance. For example, with the unit Parsec (pc), "
+        "a value of {1, 2} will make the label being fully faded out 1 Parsec before "
+        "the closest distance and 2 Parsec away from the furthest distance."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo FadeStartUnitOptionInfo = {
-        "FadeStartUnit",
-        "Fade-In/-Out Start Unit.",
-        "Unit for fade-in/-out starting position calculation."
+    constexpr openspace::properties::Property::PropertyInfo FadeDistancesInfo = {
+        "FadeDistances",
+        "Fade Distances",
+        "The distance range in which the labels should be fully opaque, specified in "
+        "the chosen unit. The distance from the position of the label to the camera."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo FadeEndUnitOptionInfo = {
-        "FadeEndUnit",
-        "Fade-In/-Out End Unit.",
-        "Unit for fade-in/-out ending position calculation."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeStartDistInfo = {
-        "FadeStartDistance",
-        "Fade-In/-Out starting distance.",
-        "Fade-In/-Out starting distance."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeEndDistInfo = {
-        "FadeEndDistance",
-        "Fade-In/-Out ending distance.",
-        "Fade-In/-Out ending distance."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeStartSpeedInfo = {
-        "FadeStartSpeed",
-        "Fade-In/-Out starting speed.",
-        "Fade-In/-Out starting speed."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FadeEndSpeedInfo = {
-        "FadeEndSpeed",
-        "Fade-In/-Out ending speed.",
-        "Fade-In/-Out ending speed."
+    constexpr openspace::properties::Property::PropertyInfo FadeUnitOptionInfo = {
+        "FadeUnit",
+        "Fade Distance Unit",
+        "Distance unit for fade-in/-out distance calculations. Defaults to \"au\"."
     };
 
     struct [[codegen::Dictionary(RenderableLabels)]] Parameters {
@@ -190,33 +163,27 @@ namespace {
             PositionNormal [[codegen::key("Camera Position Normal")]]
         };
 
-        // [[codegen::verbatim(LabelOrientationOptionInfo.description)]]
-        std::optional<Orientation> labelOrientationOption;
+        // [[codegen::verbatim(OrientationOptionInfo.description)]]
+        std::optional<Orientation> orientationOption;
 
-        // [[codegen::verbatim(LabelColorInfo.description)]]
-        std::optional<glm::vec3> labelColor [[codegen::color()]];
+        // [[codegen::verbatim(ColorInfo.description)]]
+        std::optional<glm::vec3> color [[codegen::color()]];
 
-        // [[codegen::verbatim(LabelTextInfo.description)]]
-        std::optional<std::string> labelText;
+        // [[codegen::verbatim(TextInfo.description)]]
+        std::optional<std::string> text;
 
         // [[codegen::verbatim(FontSizeInfo.description)]]
         std::optional<float> fontSize;
 
-        // [[codegen::verbatim(LabelSizeInfo.description)]]
-        std::optional<float> labelSize;
+        // [[codegen::verbatim(SizeInfo.description)]]
+        std::optional<float> size;
 
-        // [[codegen::verbatim(LabelMinSizeInfo.description)]]
-        std::optional<float> labelMinSize;
-
-        // [[codegen::verbatim(LabelMaxSizeInfo.description)]]
-        std::optional<float> labelMaxSize;
+        // [[codegen::verbatim(MinMaxSizeInfo.description)]]
+        std::optional<glm::ivec2> minMaxSize;
 
         // [[codegen::verbatim(EnableFadingEffectInfo.description)]]
         std::optional<bool> enableFading;
 
-        // [[codegen::verbatim(PixelSizeControlInfo.description)]]
-        std::optional<bool> enablePixelControl;
-
         // [[codegen::verbatim(TransformationMatrixInfo.description)]]
         std::optional<glm::dmat4x4> transformationMatrix;
 
@@ -230,28 +197,19 @@ namespace {
             AstronomicalUnit [[codegen::key("au")]],
             Parsec [[codegen::key("pc")]],
             KiloParsec [[codegen::key("Kpc")]],
-            MegaParsec [[codgen::key("Mpc")]],
+            MegaParsec [[codegen::key("Mpc")]],
             GigaParsec [[codegen::key("Gpc")]],
             GigaLightyear [[codegen::key("Gly")]]
         };
 
-        // [[codegen::verbatim(FadeStartUnitOptionInfo.description)]]
-        std::optional<Unit> fadeStartUnit;
+        // [[codegen::verbatim(FadeUnitOptionInfo.description)]]
+        std::optional<Unit> fadeUnit;
 
-        // [[codegen::verbatim(FadeEndUnitOptionInfo.description)]]
-        std::optional<Unit> fadeEndUnit;
+        // [[codegen::verbatim(FadeDistancesInfo.description)]]
+        std::optional<glm::vec2> fadeDistances;
 
-        // [[codegen::verbatim(FadeStartDistInfo.description)]]
-        std::optional<float> fadeStartDistance;
-
-        // [[codegen::verbatim(FadeEndDistInfo.description)]]
-        std::optional<float> fadeEndDistance;
-
-        // [[codegen::verbatim(FadeStartSpeedInfo.description)]]
-        std::optional<float> fadeStartSpeed;
-
-        // [[codegen::verbatim(FadeEndSpeedInfo.description)]]
-        std::optional<float> fadeEndSpeed;
+        // [[codegen::verbatim(FadeWidthsInfo.description)]]
+        std::optional<glm::vec2> fadeWidths;
     };
 #include "renderablelabels_codegen.cpp"
 } // namespace
@@ -259,39 +217,26 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableLabels::Documentation() {
-    return codegen::doc<Parameters>();
+    return codegen::doc<Parameters>("base_renderable_labels");
 }
 
 RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _labelColor(
-        LabelColorInfo,
-        glm::vec3(1.f, 1.f, 1.f),
-        glm::vec3(0.f),
-        glm::vec3(1.f)
-    )
-    , _labelSize(LabelSizeInfo, 8.f, 0.5f, 30.f)
+    , _color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
+    , _size(SizeInfo, 8.f, 0.5f, 30.f)
     , _fontSize(FontSizeInfo, 50.f, 1.f, 100.f)
-    , _labelMinSize(LabelMinSizeInfo, 8.f, 0.5f, 24.f)
-    , _labelMaxSize(LabelMaxSizeInfo, 20.f, 0.5f, 100.f)
-    , _pixelSizeControl(PixelSizeControlInfo, false)
+    , _minMaxSize(MinMaxSizeInfo, glm::ivec2(8, 20), glm::ivec2(0), glm::ivec2(100))
     , _enableFadingEffect(EnableFadingEffectInfo, false)
-    , _labelText(LabelTextInfo, "")
-    , _fadeStartDistance(FadeStartDistInfo, 1.f, 0.f, 100.f)
-    , _fadeEndDistance(FadeEndDistInfo, 1.f, 0.f, 100.f)
-    , _fadeStartSpeed(FadeStartSpeedInfo, 1.f, 1.f, 100.f)
-    , _fadeEndSpeed(FadeEndSpeedInfo, 1.f, 1.f, 100.f)
-    , _labelOrientationOption(
-        LabelOrientationOptionInfo,
+    , _text(TextInfo, "")
+    , _fadeDistances(FadeDistancesInfo, glm::vec2(1.f), glm::vec2(0.f), glm::vec2(100.f))
+    , _fadeWidths(FadeWidthsInfo, glm::vec2(1.f), glm::vec2(0.f), glm::vec2(100.f))
+    , _orientationOption(
+        OrientationOptionInfo,
         properties::OptionProperty::DisplayType::Dropdown
     )
-    , _fadeStartUnitOption(
-        FadeStartUnitOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
-    , _fadeEndUnitOption(
-        FadeEndUnitOptionInfo,
+    , _fadeUnitOption(
+        FadeUnitOptionInfo,
         properties::OptionProperty::DisplayType::Dropdown
     )
 {
@@ -330,28 +275,28 @@ RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
 
     addProperty(_blendMode);
 
-    _labelOrientationOption.addOption(ViewDirection, "Camera View Direction");
-    _labelOrientationOption.addOption(NormalDirection, "Camera Position Normal");
+    _orientationOption.addOption(ViewDirection, "Camera View Direction");
+    _orientationOption.addOption(NormalDirection, "Camera Position Normal");
 
-    _labelOrientationOption = NormalDirection;
-    if (p.labelOrientationOption.has_value()) {
-        switch (*p.labelOrientationOption) {
+    _orientationOption = NormalDirection;
+    if (p.orientationOption.has_value()) {
+        switch (*p.orientationOption) {
             case Parameters::Orientation::ViewDirection:
-                _labelOrientationOption = ViewDirection;
+                _orientationOption = ViewDirection;
                 break;
             case Parameters::Orientation::PositionNormal:
-                _labelOrientationOption = NormalDirection;
+                _orientationOption = NormalDirection;
                 break;
         }
     }
-    addProperty(_labelOrientationOption);
+    addProperty(_orientationOption);
 
-    _labelText = p.labelText.value_or(_labelText);
-    addProperty(_labelText);
+    _text = p.text.value_or(_text);
+    addProperty(_text);
 
-    _labelColor = p.labelColor.value_or(_labelColor);
-    _labelColor.setViewOption(properties::Property::ViewOptions::Color);
-    addProperty(_labelColor);
+    _color = p.color.value_or(_color);
+    _color.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_color);
 
     _fontSize = p.fontSize.value_or(_fontSize);
     _fontSize.onChange([&]() {
@@ -364,156 +309,86 @@ RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
     });
     addProperty(_fontSize);
 
-    _labelSize = p.labelSize.value_or(_labelSize);
-    addProperty(_labelSize);
+    // @TODO (emmbr, 2021-05-31): Temporarily set as read only, to avoid errors from font
+    // rendering/loading
+    _fontSize.setReadOnly(true);
 
-    _labelMinSize = p.labelMinSize.value_or(_labelMinSize);
-    addProperty(_labelMinSize);
+    _size = p.size.value_or(_size);
+    addProperty(_size);
 
-    _labelMaxSize = p.labelMaxSize.value_or(_labelMaxSize);
-    addProperty(_labelMaxSize);
+    _minMaxSize = p.minMaxSize.value_or(_minMaxSize);
+    _minMaxSize.setViewOption(properties::Property::ViewOptions::MinMaxRange);
+    addProperty(_minMaxSize);
 
     _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 
-    _pixelSizeControl = p.enablePixelControl.value_or(_pixelSizeControl);
-    if (_pixelSizeControl) {
-        // @TODO (abock, 2021-01-28) I don't know why we only add the property if the
-        // pixel control is enabled, but I think this is an error
-        addProperty(_pixelSizeControl);
-    }
-
     _enableFadingEffect = p.enableFading.value_or(_enableFadingEffect);
     addProperty(_enableFadingEffect);
 
-    _fadeStartDistance = p.fadeStartDistance.value_or(_fadeStartDistance);
-    addProperty(_fadeStartDistance);
+    _fadeUnitOption.addOption(Meter, MeterUnit);
+    _fadeUnitOption.addOption(Kilometer, KilometerUnit);
+    _fadeUnitOption.addOption(Megameter, MegameterUnit);
+    _fadeUnitOption.addOption(Gigameter, GigameterUnit);
+    _fadeUnitOption.addOption(AU, AstronomicalUnit);
+    _fadeUnitOption.addOption(Terameter, TerameterUnit);
+    _fadeUnitOption.addOption(Petameter, PetameterUnit);
+    _fadeUnitOption.addOption(Parsec, ParsecUnit);
+    _fadeUnitOption.addOption(Kiloparsec, KiloparsecUnit);
+    _fadeUnitOption.addOption(Megaparsec, MegaparsecUnit);
+    _fadeUnitOption.addOption(Gigaparsec, GigaparsecUnit);
+    _fadeUnitOption.addOption(GigalightYears, GigalightyearUnit);
 
-    _fadeStartUnitOption.addOption(Meter, MeterUnit);
-    _fadeStartUnitOption.addOption(Kilometer, KilometerUnit);
-    _fadeStartUnitOption.addOption(Megameter, MegameterUnit);
-    _fadeStartUnitOption.addOption(Gigameter, GigameterUnit);
-    _fadeStartUnitOption.addOption(AU, AstronomicalUnit);
-    _fadeStartUnitOption.addOption(Terameter, TerameterUnit);
-    _fadeStartUnitOption.addOption(Petameter, PetameterUnit);
-    _fadeStartUnitOption.addOption(Parsec, ParsecUnit);
-    _fadeStartUnitOption.addOption(Kiloparsec, KiloparsecUnit);
-    _fadeStartUnitOption.addOption(Megaparsec, MegaparsecUnit);
-    _fadeStartUnitOption.addOption(Gigaparsec, GigaparsecUnit);
-    _fadeStartUnitOption.addOption(GigalightYears, GigalightyearUnit);
-
-
-    if (p.fadeStartUnit.has_value()) {
-        switch (*p.fadeStartUnit) {
+    if (p.fadeUnit.has_value()) {
+        switch (*p.fadeUnit) {
             case Parameters::Unit::Meter:
-                _fadeStartUnitOption = Meter;
+                _fadeUnitOption = Meter;
                 break;
             case Parameters::Unit::Kilometer:
-                _fadeStartUnitOption = Kilometer;
+                _fadeUnitOption = Kilometer;
                 break;
             case Parameters::Unit::Megameter:
-                _fadeStartUnitOption = Megameter;
+                _fadeUnitOption = Megameter;
                 break;
             case Parameters::Unit::Gigameter:
-                _fadeStartUnitOption = Gigameter;
+                _fadeUnitOption = Gigameter;
                 break;
             case Parameters::Unit::Terameter:
-                _fadeStartUnitOption = Terameter;
+                _fadeUnitOption = Terameter;
                 break;
             case Parameters::Unit::Petameter:
-                _fadeStartUnitOption = Petameter;
+                _fadeUnitOption = Petameter;
                 break;
             case Parameters::Unit::AstronomicalUnit:
-                _fadeStartUnitOption = AU;
+                _fadeUnitOption = AU;
                 break;
             case Parameters::Unit::Parsec:
-                _fadeStartUnitOption = Parsec;
+                _fadeUnitOption = Parsec;
                 break;
             case Parameters::Unit::KiloParsec:
-                _fadeStartUnitOption = Kiloparsec;
+                _fadeUnitOption = Kiloparsec;
                 break;
             case Parameters::Unit::MegaParsec:
-                _fadeStartUnitOption = Megaparsec;
+                _fadeUnitOption = Megaparsec;
                 break;
             case Parameters::Unit::GigaParsec:
-                _fadeStartUnitOption = Gigaparsec;
+                _fadeUnitOption = Gigaparsec;
                 break;
             case Parameters::Unit::GigaLightyear:
-                _fadeStartUnitOption = GigalightYears;
+                _fadeUnitOption = GigalightYears;
                 break;
         }
     }
     else {
-        _fadeStartUnitOption = AU;
+        _fadeUnitOption = AU;
     }
-    addProperty(_fadeStartUnitOption);
+    addProperty(_fadeUnitOption);
 
-    _fadeStartSpeed = p.fadeStartSpeed.value_or(_fadeStartSpeed);
-    addProperty(_fadeStartSpeed);
+    _fadeDistances = p.fadeDistances.value_or(_fadeDistances);
+    _fadeDistances.setViewOption(properties::Property::ViewOptions::MinMaxRange);
+    addProperty(_fadeDistances);
 
-    _fadeEndDistance = p.fadeEndDistance.value_or(_fadeEndDistance);
-    addProperty(_fadeEndDistance);
-
-    _fadeEndUnitOption.addOption(Meter, MeterUnit);
-    _fadeEndUnitOption.addOption(Kilometer, KilometerUnit);
-    _fadeEndUnitOption.addOption(Megameter, MegameterUnit);
-    _fadeEndUnitOption.addOption(Gigameter, GigameterUnit);
-    _fadeEndUnitOption.addOption(AU, AstronomicalUnit);
-    _fadeEndUnitOption.addOption(Terameter, TerameterUnit);
-    _fadeEndUnitOption.addOption(Petameter, PetameterUnit);
-    _fadeEndUnitOption.addOption(Parsec, ParsecUnit);
-    _fadeEndUnitOption.addOption(Kiloparsec, KiloparsecUnit);
-    _fadeEndUnitOption.addOption(Megaparsec, MegaparsecUnit);
-    _fadeEndUnitOption.addOption(Gigaparsec, GigaparsecUnit);
-    _fadeEndUnitOption.addOption(GigalightYears, GigalightyearUnit);
-
-
-    if (p.fadeEndUnit.has_value()) {
-        switch (*p.fadeEndUnit) {
-            case Parameters::Unit::Meter:
-                _fadeStartUnitOption = Meter;
-                break;
-            case Parameters::Unit::Kilometer:
-                _fadeStartUnitOption = Kilometer;
-                break;
-            case Parameters::Unit::Megameter:
-                _fadeStartUnitOption = Megameter;
-                break;
-            case Parameters::Unit::Gigameter:
-                _fadeStartUnitOption = Gigameter;
-                break;
-            case Parameters::Unit::Terameter:
-                _fadeStartUnitOption = Terameter;
-                break;
-            case Parameters::Unit::Petameter:
-                _fadeStartUnitOption = Petameter;
-                break;
-            case Parameters::Unit::AstronomicalUnit:
-                _fadeStartUnitOption = AU;
-                break;
-            case Parameters::Unit::Parsec:
-                _fadeStartUnitOption = Parsec;
-                break;
-            case Parameters::Unit::KiloParsec:
-                _fadeEndUnitOption = Kiloparsec;
-                break;
-            case Parameters::Unit::MegaParsec:
-                _fadeEndUnitOption = Megaparsec;
-                break;
-            case Parameters::Unit::GigaParsec:
-                _fadeEndUnitOption = Gigaparsec;
-                break;
-            case Parameters::Unit::GigaLightyear:
-                _fadeEndUnitOption = GigalightYears;
-                break;
-        }
-    }
-    else {
-        _fadeEndUnitOption = AU;
-    }
-    addProperty(_fadeEndUnitOption);
-
-    _fadeEndSpeed = p.fadeEndSpeed.value_or(_fadeEndSpeed);
-    addProperty(_fadeEndSpeed);
+    _fadeWidths = p.fadeWidths.value_or(_fadeWidths);
+    addProperty(_fadeWidths);
 }
 
 bool RenderableLabels::isReady() const {
@@ -528,7 +403,6 @@ void RenderableLabels::initialize() {
 
 void RenderableLabels::initializeGL() {
     if (_font == nullptr) {
-        //size_t _fontSize = 50;
         _font = global::fontManager->font(
             "Mono",
             _fontSize,
@@ -554,17 +428,7 @@ void RenderableLabels::render(const RenderData& data, RendererTasks&) {
         float distanceNodeToCamera = static_cast<float>(
             glm::distance(data.camera.positionVec3(), data.modelTransform.translation)
         );
-        float sUnit = unit(_fadeStartUnitOption);
-        float eUnit = unit(_fadeEndUnitOption);
-        float startX = _fadeStartDistance * sUnit;
-        float endX = _fadeEndDistance * eUnit;
-        fadeInVariable = linearSmoothStepFunc(
-            distanceNodeToCamera,
-            startX,
-            endX,
-            sUnit,
-            eUnit
-        );
+        fadeInVariable = computeFadeFactor(distanceNodeToCamera);
     }
 
     glm::dmat4 modelMatrix(1.0);
@@ -598,7 +462,7 @@ void RenderableLabels::render(const RenderData& data, RendererTasks&) {
 
 
 void RenderableLabels::setLabelText(const std::string & newText) {
-    _labelText = newText;
+    _text = newText;
 }
 
 void RenderableLabels::renderLabels(const RenderData& data,
@@ -606,23 +470,23 @@ void RenderableLabels::renderLabels(const RenderData& data,
                                     const glm::dvec3& orthoRight,
                                     const glm::dvec3& orthoUp, float fadeInVariable)
 {
-    glm::vec4 textColor = glm::vec4(glm::vec3(_labelColor), 1.f);
+    glm::vec4 textColor = glm::vec4(glm::vec3(_color), 1.f);
 
     textColor.a *= fadeInVariable;
     textColor.a *= _opacity;
 
     ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo;
 
-    labelInfo.orthoRight       = orthoRight;
-    labelInfo.orthoUp          = orthoUp;
-    labelInfo.minSize          = static_cast<int>(_labelMinSize);
-    labelInfo.maxSize          = static_cast<int>(_labelMaxSize);
-    labelInfo.cameraPos        = data.camera.positionVec3();
-    labelInfo.cameraLookUp     = data.camera.lookUpVectorWorldSpace();
-    labelInfo.renderType       = _labelOrientationOption;
-    labelInfo.mvpMatrix        = modelViewProjectionMatrix;
-    labelInfo.scale            = powf(10.f, _labelSize);
-    labelInfo.enableDepth      = true;
+    labelInfo.orthoRight = orthoRight;
+    labelInfo.orthoUp = orthoUp;
+    labelInfo.minSize = _minMaxSize.value().x;
+    labelInfo.maxSize = _minMaxSize.value().y;
+    labelInfo.cameraPos = data.camera.positionVec3();
+    labelInfo.cameraLookUp = data.camera.lookUpVectorWorldSpace();
+    labelInfo.renderType = _orientationOption;
+    labelInfo.mvpMatrix = modelViewProjectionMatrix;
+    labelInfo.scale = powf(10.f, _size);
+    labelInfo.enableDepth = true;
     labelInfo.enableFalseDepth = false;
 
     // We don't use spice rotation and scale
@@ -633,52 +497,34 @@ void RenderableLabels::renderLabels(const RenderData& data,
     ghoul::fontrendering::FontRenderer::defaultProjectionRenderer().render(
         *_font,
         transformedPos,
-        _labelText.value(),
+        _text.value(),
         textColor,
         labelInfo
     );
 }
 
-float RenderableLabels::changedPerlinSmoothStepFunc(float x, float startX,
-                                                    float endX) const
-{
-    float f1 = 6.f * powf((x - startX), 5.f) - 15.f * powf((x - startX), 4.f) +
-               10.f * powf((x - startX), 3.f);
-    float f2 = -6.f * powf((x - endX), 5.f) + 15.f * powf((x - endX), 4.f) -
-               10.f * powf((x - endX), 3.f) + 1.f;
-    float f3 = 1.f;
+float RenderableLabels::computeFadeFactor(float distanceNodeToCamera) const {
+    float distanceUnit = unit(_fadeUnitOption);
+
+    float x = distanceNodeToCamera;
+    float startX = _fadeDistances.value().x * distanceUnit;
+    float endX = _fadeDistances.value().y * distanceUnit;
+
+    // The distances over which the fading should happen
+    float fadingStartDistance = _fadeWidths.value().x * distanceUnit;
+    float fadingEndDistance = _fadeWidths.value().y * distanceUnit;
 
     if (x <= startX) {
+        float f1 = 1.f - (startX - x) / fadingStartDistance;
         return std::clamp(f1, 0.f, 1.f);
     }
     else if (x > startX && x < endX) {
-        return f3;
+        return 1.f; // not faded
     }
-    else if (x >= endX) {
+    else { // x >= endX
+        float f2 = 1.f - (x - endX) / fadingEndDistance;
         return std::clamp(f2, 0.f, 1.f);
     }
-    return x;
-}
-
-float RenderableLabels::linearSmoothStepFunc(float x, float startX, float endX,
-                                             float sUnit, float eUnit) const
-{
-    float sdiv = 1.f / (sUnit * _fadeStartSpeed);
-    float ediv = -1.f / (eUnit * _fadeEndSpeed);
-    float f1 = sdiv * (x - startX) + 1.f;
-    float f2 = ediv * (x - endX) + 1.f;
-    float f3 = 1.f;
-
-    if (x <= startX) {
-        return std::clamp(f1, 0.f, 1.f);
-    }
-    else if (x > startX && x < endX) {
-        return f3;
-    }
-    else if (x >= endX) {
-        return std::clamp(f2, 0.f, 1.f);
-    }
-    return x;
 }
 
 float RenderableLabels::unit(int unit) const {
diff --git a/modules/base/rendering/renderablelabels.h b/modules/base/rendering/renderablelabels.h
index a1cad2dd6d..d1cff72716 100644
--- a/modules/base/rendering/renderablelabels.h
+++ b/modules/base/rendering/renderablelabels.h
@@ -31,6 +31,7 @@
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/vector/ivec2property.h>
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
 
@@ -77,7 +78,7 @@ protected:
     std::string toString(int unit) const;
 
     // Data may require some type of transformation prior the spice transformation being
-    // applied.
+    // applied
     glm::dmat4 _transformationMatrix = glm::dmat4(1.0);
 
     enum Unit {
@@ -99,31 +100,24 @@ private:
     void renderLabels(const RenderData& data, const glm::dmat4& modelViewProjectionMatrix,
         const glm::dvec3& orthoRight, const glm::dvec3& orthoUp, float fadeInVariable);
 
-    float changedPerlinSmoothStepFunc(float x, float startX, float endX) const;
+    float computeFadeFactor(float distanceNodeToCamera) const;
 
-    float linearSmoothStepFunc(float x, float startX, float endX, float sUnit,
-        float eUnit) const;
-
-    properties::Vec3Property _labelColor;
-    properties::FloatProperty _labelSize;
+    properties::Vec3Property _color;
     properties::FloatProperty _fontSize;
-    properties::FloatProperty _labelMinSize;
-    properties::FloatProperty _labelMaxSize;
-    properties::BoolProperty _pixelSizeControl;
-    properties::BoolProperty _enableFadingEffect;
-    properties::StringProperty _labelText;
-    properties::FloatProperty _fadeStartDistance;
-    properties::FloatProperty _fadeEndDistance;
-    properties::FloatProperty _fadeStartSpeed;
-    properties::FloatProperty _fadeEndSpeed;
+    properties::FloatProperty _size;
+    properties::IVec2Property _minMaxSize;
 
-    properties::OptionProperty _labelOrientationOption;
-    properties::OptionProperty _fadeStartUnitOption;
-    properties::OptionProperty _fadeEndUnitOption;
+    properties::StringProperty _text;
+
+    properties::BoolProperty _enableFadingEffect;
+    properties::Vec2Property _fadeWidths;
+    properties::Vec2Property _fadeDistances;
+    properties::OptionProperty _fadeUnitOption;
+
+    properties::OptionProperty _orientationOption;
 
     std::shared_ptr<ghoul::fontrendering::Font> _font;
 
-    std::string _speckFile;
     std::string _colorMapFile;
     std::string _labelFile;
     std::string _colorOptionString;
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index f7003a17cb..892c7d6bd1 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -157,13 +157,27 @@ namespace {
             Centimeter,
             Decimeter,
             Meter,
-            Kilometer
+            Kilometer,
+
+            // Weird units
+            Thou,
+            Inch,
+            Foot,
+            Yard,
+            Chain,
+            Furlong,
+            Mile
         };
 
         // The scale of the model. For example if the model is in centimeters
         // then ModelScale = Centimeter or ModelScale = 0.01
         std::optional<std::variant<ScaleUnit, double>> modelScale;
 
+        // By default the given ModelScale is used to scale the model down,
+        // by setting this setting to true the model is instead scaled up with the
+        // given ModelScale
+        std::optional<bool> invertModelScale;
+
         // Set if invisible parts (parts with no textures or materials) of the model
         // should be forced to render or not.
         std::optional<bool> forceRenderInvisible;
@@ -203,13 +217,13 @@ namespace {
         std::optional<AnimationMode> animationMode;
 
         // [[codegen::verbatim(AmbientIntensityInfo.description)]]
-        std::optional<double> ambientIntensity;
+        std::optional<float> ambientIntensity;
 
         // [[codegen::verbatim(DiffuseIntensityInfo.description)]]
-        std::optional<double> diffuseIntensity;
+        std::optional<float> diffuseIntensity;
 
         // [[codegen::verbatim(SpecularIntensityInfo.description)]]
-        std::optional<double> specularIntensity;
+        std::optional<float> specularIntensity;
 
         // [[codegen::verbatim(ShadingInfo.description)]]
         std::optional<bool> performShading;
@@ -242,9 +256,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableModel::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_model";
-    return doc;
+    return codegen::doc<Parameters>("base_renderable_model");
 }
 
 RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
@@ -262,8 +274,8 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
         glm::dmat3(1.0)
     )
     , _rotationVec(RotationVecInfo, glm::dvec3(0.0), glm::dvec3(0.0), glm::dvec3(360.0))
-    , _enableOpacityBlending(EnableOpacityBlendingInfo, false)
     , _disableDepthTest(DisableDepthTestInfo, false)
+    , _enableOpacityBlending(EnableOpacityBlendingInfo, false)
     , _blendingFuncOption(
         BlendingOptionInfo,
         properties::OptionProperty::DisplayType::Dropdown
@@ -285,13 +297,15 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
         }
     }
 
-    std::string file = absPath(p.geometryFile.string());
+    std::string file = absPath(p.geometryFile.string()).string();
     _geometry = ghoul::io::ModelReader::ref().loadModel(
         file,
         ghoul::io::ModelReader::ForceRenderInvisible(_forceRenderInvisible),
         ghoul::io::ModelReader::NotifyInvisibleDropped(_notifyInvisibleDropped)
     );
 
+    _invertModelScale = p.invertModelScale.value_or(_invertModelScale);
+
     if (p.modelScale.has_value()) {
         if (std::holds_alternative<Parameters::ScaleUnit>(*p.modelScale)) {
             Parameters::ScaleUnit scaleUnit =
@@ -320,10 +334,33 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
                 case Parameters::ScaleUnit::Kilometer:
                     distanceUnit = DistanceUnit::Kilometer;
                     break;
+
+                // Weired units
+                case Parameters::ScaleUnit::Thou:
+                    distanceUnit = DistanceUnit::Thou;
+                    break;
+                case Parameters::ScaleUnit::Inch:
+                    distanceUnit = DistanceUnit::Inch;
+                    break;
+                case Parameters::ScaleUnit::Foot:
+                    distanceUnit = DistanceUnit::Foot;
+                    break;
+                case Parameters::ScaleUnit::Yard:
+                    distanceUnit = DistanceUnit::Yard;
+                    break;
+                case Parameters::ScaleUnit::Chain:
+                    distanceUnit = DistanceUnit::Chain;
+                    break;
+                case Parameters::ScaleUnit::Furlong:
+                    distanceUnit = DistanceUnit::Furlong;
+                    break;
+                case Parameters::ScaleUnit::Mile:
+                    distanceUnit = DistanceUnit::Mile;
+                    break;
                 default:
                     throw ghoul::MissingCaseException();
             }
-            _modelScale = convertUnit(distanceUnit, DistanceUnit::Meter);
+            _modelScale = toMeter(distanceUnit);
         }
         else if (std::holds_alternative<double>(*p.modelScale)) {
             _modelScale = std::get<double>(*p.modelScale);
@@ -331,6 +368,10 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
         else {
             throw ghoul::MissingCaseException();
         }
+
+        if (_invertModelScale) {
+            _modelScale = 1.0 / _modelScale;
+        }
     }
 
     if (p.animationStartTime.has_value()) {
@@ -385,7 +426,9 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
                     throw ghoul::MissingCaseException();
             }
 
-            _geometry->setTimeScale(convertTime(1.0, timeUnit, TimeUnit::Second));
+            _geometry->setTimeScale(static_cast<float>(
+                convertTime(1.0, timeUnit, TimeUnit::Second))
+            );
         }
         else {
             throw ghoul::MissingCaseException();
diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h
index d1d2cbc9fa..1de33afe5b 100644
--- a/modules/base/rendering/renderablemodel.h
+++ b/modules/base/rendering/renderablemodel.h
@@ -81,6 +81,7 @@ private:
 
     std::unique_ptr<ghoul::modelgeometry::ModelGeometry> _geometry;
     double _modelScale = 1.0;
+    bool _invertModelScale = false;
     bool _forceRenderInvisible = false;
     bool _notifyInvisibleDropped = true;
     std::string _animationStart;
@@ -88,7 +89,6 @@ private:
     properties::BoolProperty _enableAnimation;
 
     properties::FloatProperty _ambientIntensity;
-
     properties::FloatProperty _diffuseIntensity;
     properties::FloatProperty _specularIntensity;
 
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index 0c6de14407..acb91f056f 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -104,9 +104,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableNodeLine::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_renderablenodeline";
-    return doc;
+    return codegen::doc<Parameters>("base_renderable_renderablenodeline");
 }
 
 RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index a029a4f576..86401eb031 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -45,9 +45,9 @@
 namespace {
     constexpr const char* ProgramName = "Plane";
 
-    enum BlendMode {
-        BlendModeNormal = 0,
-        BlendModeAdditive
+    enum class BlendMode {
+        Normal = 0,
+        Additive
     };
 
     constexpr openspace::properties::Property::PropertyInfo BillboardInfo = {
@@ -91,7 +91,7 @@ namespace {
         // [[codegen::verbatim(BlendModeInfo.description)]]
         std::optional<BlendMode> blendMode;
 
-        // [[codegen::verbatim(BlendModeInfo.description)]]
+        // [[codegen::verbatim(MultiplyColorInfo.description)]]
         std::optional<glm::vec3> multiplyColor [[codegen::color()]];
     };
 #include "renderableplane_codegen.cpp"
@@ -100,9 +100,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderablePlane::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_plane";
-    return doc;
+    return codegen::doc<Parameters>("base_renderable_plane");
 }
 
 RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
@@ -121,15 +119,15 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
     _billboard = p.billboard.value_or(_billboard);
 
     _blendMode.addOptions({
-        { BlendModeNormal, "Normal" },
-        { BlendModeAdditive, "Additive"}
+        { static_cast<int>(BlendMode::Normal), "Normal" },
+        { static_cast<int>(BlendMode::Additive), "Additive"}
     });
     _blendMode.onChange([&]() {
         switch (_blendMode) {
-            case BlendModeNormal:
+            case static_cast<int>(BlendMode::Normal):
                 setRenderBinFromOpacity();
                 break;
-            case BlendModeAdditive:
+            case static_cast<int>(BlendMode::Additive):
                 setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
                 break;
             default:
@@ -138,17 +136,17 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
     });
 
     _opacity.onChange([&]() {
-        if (_blendMode == BlendModeNormal) {
+        if (_blendMode == static_cast<int>(BlendMode::Normal)) {
             setRenderBinFromOpacity();
         }
     });
 
     if (p.blendMode.has_value()) {
         if (*p.blendMode == Parameters::BlendMode::Normal) {
-            _blendMode = BlendModeNormal;
+            _blendMode = static_cast<int>(BlendMode::Normal);
         }
         else if (*p.blendMode == Parameters::BlendMode::Additive) {
-            _blendMode = BlendModeAdditive;
+            _blendMode = static_cast<int>(BlendMode::Additive);
         }
     }
 
@@ -157,7 +155,7 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
 
     addProperty(_billboard);
 
-    _size.setViewOption(properties::Property::ViewOptions::Logarithmic);
+    _size.setExponent(15.f);
     addProperty(_size);
     _size.onChange([this](){ _planeIsDirty = true; });
 
@@ -264,10 +262,14 @@ void RenderablePlane::render(const RenderData& data, RendererTasks&) {
                                 RenderEngine::RendererImplementation::ABuffer;
 
     if (usingABufferRenderer) {
-        _shader->setUniform("additiveBlending", _blendMode == BlendModeAdditive);
+        _shader->setUniform(
+            "additiveBlending",
+            _blendMode == static_cast<int>(BlendMode::Additive)
+        );
     }
 
-    bool additiveBlending = (_blendMode == BlendModeAdditive) && usingFramebufferRenderer;
+    bool additiveBlending =
+        (_blendMode == static_cast<int>(BlendMode::Additive)) && usingFramebufferRenderer;
     if (additiveBlending) {
         glDepthMask(false);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE);
@@ -275,6 +277,7 @@ void RenderablePlane::render(const RenderData& data, RendererTasks&) {
 
     glBindVertexArray(_quad);
     glDrawArrays(GL_TRIANGLES, 0, 6);
+    glBindVertexArray(0);
 
     if (additiveBlending) {
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -327,6 +330,7 @@ void RenderablePlane::createPlane() {
         sizeof(GLfloat) * 6,
         reinterpret_cast<void*>(sizeof(GLfloat) * 4)
     );
+    glBindVertexArray(0);
 }
 
 } // namespace openspace
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index b19206d0c5..7b48b72bb5 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -78,8 +78,9 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderablePlaneImageLocal::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_plane_image_local";
+    documentation::Documentation doc = codegen::doc<Parameters>(
+        "base_renderable_plane_image_local"
+    );
 
     // @TODO cleanup
     // Insert the parents documentation entries until we have a verifier that can deal
@@ -101,14 +102,12 @@ RenderablePlaneImageLocal::RenderablePlaneImageLocal(const ghoul::Dictionary& di
 
     addProperty(_blendMode);
 
-    _texturePath = absPath(p.texture);
-    _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath);
+    _texturePath = absPath(p.texture).string();
+    _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath.value());
 
     addProperty(_texturePath);
     _texturePath.onChange([this]() { loadTexture(); });
-    _textureFile->setCallback(
-        [this](const ghoul::filesystem::File&) { _textureIsDirty = true; }
-    );
+    _textureFile->setCallback([this]() { _textureIsDirty = true; });
 
     if (p.renderType.has_value()) {
         switch (*p.renderType) {
@@ -193,7 +192,7 @@ void RenderablePlaneImageLocal::loadTexture() {
             std::to_string(hash),
             [path = _texturePath]() -> std::unique_ptr<ghoul::opengl::Texture> {
                 std::unique_ptr<ghoul::opengl::Texture> texture =
-                    ghoul::io::TextureReader::ref().loadTexture(absPath(path));
+                    ghoul::io::TextureReader::ref().loadTexture(absPath(path).string());
 
                 LDEBUGC(
                     "RenderablePlaneImageLocal",
@@ -209,10 +208,8 @@ void RenderablePlaneImageLocal::loadTexture() {
 
         BaseModule::TextureManager.release(t);
 
-        _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath);
-        _textureFile->setCallback(
-            [&](const ghoul::filesystem::File&) { _textureIsDirty = true; }
-        );
+        _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath.value());
+        _textureFile->setCallback([this]() { _textureIsDirty = true; });
     }
 }
 
diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp
index 368aa34439..8ce7be472e 100644
--- a/modules/base/rendering/renderableplaneimageonline.cpp
+++ b/modules/base/rendering/renderableplaneimageonline.cpp
@@ -52,8 +52,9 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderablePlaneImageOnline::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_plane_image_online";
+    documentation::Documentation doc = codegen::doc<Parameters>(
+        "base_renderable_plane_image_online"
+    );
 
     // @TODO cleanup
     // Insert the parents documentation entries until we have a verifier that can deal
@@ -75,8 +76,6 @@ RenderablePlaneImageOnline::RenderablePlaneImageOnline(
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _texturePath.onChange([this]() { _textureIsDirty = true; });
-    addProperty(_texturePath);
-
     _texturePath = p.url;
     addProperty(_texturePath);
 }
diff --git a/modules/base/rendering/renderableprism.cpp b/modules/base/rendering/renderableprism.cpp
new file mode 100644
index 0000000000..a5c9e3702a
--- /dev/null
+++ b/modules/base/rendering/renderableprism.cpp
@@ -0,0 +1,344 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2021                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/base/rendering/renderableprism.h>
+
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <openspace/rendering/renderengine.h>
+#include <openspace/util/updatestructures.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/opengl/openglstatecache.h>
+#include <ghoul/opengl/programobject.h>
+#include <optional>
+
+namespace {
+    constexpr const char _loggerCat[] = "RenderablePrism";
+
+    constexpr const std::array<const char*, 2> UniformNames = {
+        "modelViewProjectionTransform", "vs_color"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = {
+        "Segments",
+        "Segments",
+        "The number of segments the shape of the prism should have."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo LinesInfo = {
+        "NumLines",
+        "Number of Lines",
+        "The number of lines connecting the two shapes of the prism."
+    };
+
+    static const openspace::properties::Property::PropertyInfo RadiusInfo = {
+        "Radius",
+        "Radius",
+        "The radius of the prism's shape in meters."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
+        "LineWidth",
+        "Line Width",
+        "This value specifies the line width."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo LineColorInfo = {
+        "Color",
+        "Color",
+        "This value determines the RGB color for the line."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo LengthInfo = {
+        "Length",
+        "Length",
+        "The length of the prism in meters."
+    };
+
+    // Generate vertices around the unit circle on the XY-plane
+    std::vector<float> unitCircleVertices(int sectorCount) {
+        std::vector<float> vertices;
+        vertices.reserve(2 * sectorCount);
+        float sectorStep = glm::two_pi<float>() / sectorCount;
+
+        for (int i = 0; i < sectorCount; ++i) {
+            float sectorAngle = i * sectorStep;
+            vertices.push_back(cos(sectorAngle)); // x
+            vertices.push_back(sin(sectorAngle)); // y
+        }
+        return vertices;
+    }
+
+    struct [[codegen::Dictionary(RenderablePrism)]] Parameters {
+        // [[codegen::verbatim(SegmentsInfo.description)]]
+        int segments;
+
+        // [[codegen::verbatim(LinesInfo.description)]]
+        std::optional<int> lines;
+
+        // [[codegen::verbatim(RadiusInfo.description)]]
+        std::optional<float> radius;
+
+        // [[codegen::verbatim(LineWidthInfo.description)]]
+        std::optional<float> lineWidth;
+
+        // [[codegen::verbatim(LineColorInfo.description)]]
+        std::optional<glm::vec3> color [[codegen::color()]];
+
+        // [[codegen::verbatim(LengthInfo.description)]]
+        std::optional<float> length;
+    };
+#include "renderableprism_codegen.cpp"
+} // namespace
+
+namespace openspace {
+
+documentation::Documentation RenderablePrism::Documentation() {
+    documentation::Documentation doc = codegen::doc<Parameters>("base_renderable_prism");
+    return doc;
+}
+
+RenderablePrism::RenderablePrism(const ghoul::Dictionary& dictionary)
+    : Renderable(dictionary)
+    , _nShapeSegments(SegmentsInfo, 6, 3, 32)
+    , _nLines(LinesInfo, 6, 0, 32)
+    , _radius(RadiusInfo, 10.f, 0.f, 3.0e12f)
+    , _lineWidth(LineWidthInfo, 1.f, 1.f, 20.f)
+    , _lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
+    , _length(LengthInfo, 20.f, 1.f, 3.0e12f)
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    _nShapeSegments.onChange([&]() { _prismIsDirty = true; });
+    _nShapeSegments = p.segments;
+    addProperty(_nShapeSegments);
+
+    _nLines.onChange([&]() { _prismIsDirty = true; });
+    _nLines = p.lines.value_or(_nShapeSegments);
+    addProperty(_nLines);
+
+    _radius.setExponent(10.f);
+    _radius.onChange([&]() { _prismIsDirty = true; });
+    _radius = p.radius.value_or(_radius);
+    addProperty(_radius);
+
+    _lineWidth = p.lineWidth.value_or(_lineWidth);
+    addProperty(_lineWidth);
+
+    _lineColor.setViewOption(properties::Property::ViewOptions::Color);
+    _lineColor = p.color.value_or(_lineColor);
+    addProperty(_lineColor);
+
+    _length.setExponent(12.f);
+    _length.onChange([&]() { _prismIsDirty = true; });
+    _length = p.length.value_or(_length);
+    addProperty(_length);
+
+    addProperty(_opacity);
+}
+
+bool RenderablePrism::isReady() const {
+    return _shader != nullptr;
+}
+
+void RenderablePrism::initialize() {
+    updateVertexData();
+}
+
+void RenderablePrism::initializeGL() {
+    _shader = global::renderEngine->buildRenderProgram(
+        "PrismProgram",
+        absPath("${MODULE_BASE}/shaders/prism_vs.glsl"),
+        absPath("${MODULE_BASE}/shaders/prism_fs.glsl")
+    );
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+
+    glGenVertexArrays(1, &_vaoId);
+    glGenBuffers(1, &_vboId);
+    glGenBuffers(1, &_iboId);
+
+    glBindVertexArray(_vaoId);
+
+    updateBufferData();
+
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), nullptr);
+    glBindVertexArray(0);
+}
+
+void RenderablePrism::deinitializeGL() {
+    global::renderEngine->removeRenderProgram(_shader.get());
+    _shader = nullptr;
+
+    glDeleteVertexArrays(1, &_vaoId);
+    _vaoId = 0;
+
+    glDeleteBuffers(1, &_vboId);
+    _vboId = 0;
+
+    glDeleteBuffers(1, &_iboId);
+    _iboId = 0;
+}
+
+void RenderablePrism::updateVertexData() {
+    _vertexArray.clear();
+    _indexArray.clear();
+
+    // Get unit circle vertices on the XY-plane
+    std::vector<float> unitVertices = unitCircleVertices(_nShapeSegments);
+    std::vector<float> unitVerticesLines = unitCircleVertices(_nLines);
+
+    // Put base and top shape vertices into array
+    for (int i = 0; i < 2; ++i) {
+        float h = i * _length; // z value, 0 to _length
+
+        for (int j = 0, k = 0; j < _nShapeSegments && k < unitVertices.size(); ++j, k += 2) {
+            float ux = unitVertices[k];
+            float uy = unitVertices[k + 1];
+
+            _vertexArray.push_back(ux * _radius); // x
+            _vertexArray.push_back(uy * _radius); // y
+            _vertexArray.push_back(h);            // z
+        }
+    }
+
+    // Put the vertices for the connecting lines into array
+    if (_nLines == 1) {
+        // In the case of just one line then connect the center points instead
+        // Center for base shape
+        _vertexArray.push_back(0.f);
+        _vertexArray.push_back(0.f);
+        _vertexArray.push_back(0.f);
+
+        // Center for top shape
+        _vertexArray.push_back(0.f);
+        _vertexArray.push_back(0.f);
+        _vertexArray.push_back(_length);
+    }
+    else {
+        for (int j = 0, k = 0; j < _nLines && k < unitVerticesLines.size(); ++j, k += 2) {
+            float ux = unitVerticesLines[k];
+            float uy = unitVerticesLines[k + 1];
+
+            // Base
+            _vertexArray.push_back(ux * _radius); // x
+            _vertexArray.push_back(uy * _radius); // y
+            _vertexArray.push_back(0.f);          // z
+
+            // Top
+            _vertexArray.push_back(ux * _radius); // x
+            _vertexArray.push_back(uy * _radius); // y
+            _vertexArray.push_back(_length);      // z
+        }
+    }
+
+    // Indices for Base shape
+    ghoul_assert(_nShapeSegments.value <= std::numeric_limit<uint8_t>::max(), "Too many shape segments")
+    for (uint8_t i = 0; i < _nShapeSegments; ++i) {
+        _indexArray.push_back(i);
+    }
+
+    // Reset
+    _indexArray.push_back(255);
+
+    // Indices for Top shape
+    for (uint8_t i = _nShapeSegments; i < 2 * _nShapeSegments; ++i) {
+        _indexArray.push_back(i);
+    }
+
+    // Indices for connecting lines
+    for (int i = 0, k = 0; i < _nLines; ++i, k += 2) {
+        // Reset
+        _indexArray.push_back(255);
+
+        _indexArray.push_back(2 * _nShapeSegments + k);
+        _indexArray.push_back(2 * _nShapeSegments + k + 1);
+    }
+}
+
+void RenderablePrism::updateBufferData() {
+    glBindBuffer(GL_ARRAY_BUFFER, _vboId);
+    glBufferData(
+        GL_ARRAY_BUFFER,
+        _vertexArray.size() * sizeof(float),
+        _vertexArray.data(),
+        GL_STREAM_DRAW
+    );
+
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iboId);
+    glBufferData(
+        GL_ELEMENT_ARRAY_BUFFER,
+        _indexArray.size() * sizeof(uint8_t),
+        _indexArray.data(),
+        GL_STREAM_DRAW
+    );
+}
+
+void RenderablePrism::render(const RenderData& data, RendererTasks&) {
+    _shader->activate();
+
+    // Model transform and view transform needs to be in double precision
+    glm::dmat4 modelTransform =
+        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
+        glm::dmat4(data.modelTransform.rotation) *
+        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
+
+    glm::mat4 modelViewProjectionTransform =
+        data.camera.projectionMatrix() *
+        glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
+
+    // Uniforms
+    _shader->setUniform(_uniformCache.modelViewProjection, modelViewProjectionTransform);
+    _shader->setUniform(_uniformCache.color, glm::vec4(_lineColor.value(), _opacity));
+
+    // Render
+    glEnable(GL_PRIMITIVE_RESTART);
+    glPrimitiveRestartIndex(255);
+    glLineWidth(_lineWidth);
+    glBindVertexArray(_vaoId);
+
+    glDrawElements(GL_LINE_LOOP, static_cast<GLsizei>(_indexArray.size()), GL_UNSIGNED_BYTE, nullptr);
+
+    glBindVertexArray(0);
+    global::renderEngine->openglStateCache().resetLineState();
+    glDisable(GL_PRIMITIVE_RESTART);
+
+    _shader->deactivate();
+}
+
+void RenderablePrism::update(const UpdateData&) {
+    if (_shader->isDirty()) {
+        _shader->rebuildFromFile();
+        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+    }
+    if (_prismIsDirty) {
+        updateVertexData();
+        updateBufferData();
+        _prismIsDirty = false;
+    }
+}
+
+} // namespace openspace
diff --git a/include/openspace/properties/matrix/dmat3x2property.h b/modules/base/rendering/renderableprism.h
similarity index 56%
rename from include/openspace/properties/matrix/dmat3x2property.h
rename to modules/base/rendering/renderableprism.h
index e823466c34..3acfb6953f 100644
--- a/include/openspace/properties/matrix/dmat3x2property.h
+++ b/modules/base/rendering/renderableprism.h
@@ -22,17 +22,62 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_CORE___DMAT3X2PROPERTY___H__
-#define __OPENSPACE_CORE___DMAT3X2PROPERTY___H__
+#ifndef __OPENSPACE_MODULE_BASE___RENDERABLEPRISM___H__
+#define __OPENSPACE_MODULE_BASE___RENDERABLEPRISM___H__
 
-#include <openspace/properties/numericalproperty.h>
+#include <openspace/rendering/renderable.h>
 
+#include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/scalar/intproperty.h>
+#include <openspace/properties/vector/vec3property.h>
+#include <ghoul/opengl/ghoul_gl.h>
+#include <ghoul/opengl/uniformcache.h>
 #include <ghoul/glm.h>
 
-namespace openspace::properties {
+namespace ghoul::opengl { class ProgramObject; }
 
-REGISTER_NUMERICALPROPERTY_HEADER(DMat3x2Property, glm::dmat3x2)
+namespace openspace {
 
-} // namespace openspace::properties
+namespace documentation { struct Documentation; }
 
-#endif // __OPENSPACE_CORE___DMAT3X2PROPERTY___H__
+class RenderablePrism : public Renderable {
+public:
+    RenderablePrism(const ghoul::Dictionary& dictionary);
+
+    void initialize() override;
+    void initializeGL() override;
+    void deinitializeGL() override;
+
+    bool isReady() const override;
+
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
+    void update(const UpdateData& data) override;
+
+    static documentation::Documentation Documentation();
+
+private:
+    void updateVertexData();
+    void updateBufferData();
+
+    // Properties
+    properties::IntProperty _nShapeSegments;
+    properties::IntProperty _nLines;
+    properties::FloatProperty _radius;
+    properties::FloatProperty _lineWidth;
+    properties::Vec3Property _lineColor;
+    properties::FloatProperty _length;
+    UniformCache(modelViewProjection, color) _uniformCache;
+
+    std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
+    GLuint _vaoId = 0;
+    GLuint _vboId = 0;
+    GLuint _iboId = 0;
+    std::vector<float> _vertexArray;
+    std::vector<uint8_t> _indexArray;
+
+    bool _prismIsDirty = false;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_BASE___RENDERABLEPRISM___H__
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 0dae86d42c..e6b32389be 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -162,16 +162,14 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableSphere::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_sphere";
-    return doc;
+    return codegen::doc<Parameters>("base_renderable_sphere");
 }
 
 RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _texturePath(TextureInfo)
     , _orientation(OrientationInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _size(SizeInfo, 1.f, 0.f, 1e35f)
+    , _size(SizeInfo, 1.f, 0.f, 1e25f)
     , _segments(SegmentsInfo, 8, 4, 1000)
     , _mirrorTexture(MirrorTextureInfo, false)
     , _useAdditiveBlending(UseAdditiveBlendingInfo, false)
@@ -215,7 +213,7 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     }
     addProperty(_orientation);
 
-    _size.setViewOption(properties::Property::ViewOptions::Logarithmic);
+    _size.setExponent(15.f);
     _size.onChange([this]() {
         setBoundingSphere(_size);
         _sphereIsDirty = true;
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 889772bc58..63e7d99764 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -33,6 +33,7 @@
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
 #include <cmath>
 #include <optional>
@@ -51,7 +52,7 @@ namespace {
     constexpr const std::array<const char*, 14> UniformNames = {
         "opacity", "modelViewTransform", "projectionTransform", "color", "useLineFade",
         "lineFade", "vertexSortingMethod", "idOffset", "nVertices", "stride", "pointSize",
-        "renderPhase", "resolution", "lineWidth"
+        "renderPhase", "viewport", "lineWidth"
     };
 #endif
 
@@ -181,9 +182,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableTrail::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_renderabletrail";
-    return doc;
+    return codegen::doc<Parameters>("base_renderable_renderabletrail");
 }
 
 RenderableTrail::Appearance::Appearance()
@@ -340,12 +339,20 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
 
 #if !defined(__APPLE__)
     glm::ivec2 resolution = global::renderEngine->renderingResolution();
-    _programObject->setUniform(_uniformCache.resolution, resolution);
+    GLint viewport[4];
+    global::renderEngine->openglStateCache().viewport(viewport);
+    _programObject->setUniform(
+        _uniformCache.viewport,
+        static_cast<float>(viewport[0]),
+        static_cast<float>(viewport[1]),
+        static_cast<float>(viewport[2]),
+        static_cast<float>(viewport[3])
+    );
     _programObject->setUniform(
         _uniformCache.lineWidth,
         std::ceil((2.f * 1.f + _appearance.lineWidth) * std::sqrt(2.f))
     );
-#endif
+#endif // !defined(__APPLE__)
 
     if (renderPoints) {
         // The stride parameter determines the distance between larger points and
@@ -432,10 +439,10 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
         glBlendFunc(GL_SRC_ALPHA, GL_ONE);
     }
 
-    const bool renderLines = (_appearance.renderingModes == RenderingModeLines) |
+    const bool renderLines = (_appearance.renderingModes == RenderingModeLines) ||
                              (_appearance.renderingModes == RenderingModeLinesPoints);
 
-    const bool renderPoints = (_appearance.renderingModes == RenderingModePoints) |
+    const bool renderPoints = (_appearance.renderingModes == RenderingModePoints) ||
                               (_appearance.renderingModes == RenderingModeLinesPoints);
 
     if (renderLines) {
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index a65fc7fa18..6d9a6450c4 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -178,8 +178,8 @@ private:
                  pointSize, renderPhase) _uniformCache;
 #else
     UniformCache(opacity, modelView, projection, color, useLineFade, lineFade,
-        vertexSorting, idOffset, nVertices, stride, pointSize, renderPhase,
-        resolution, lineWidth) _uniformCache;
+        vertexSorting, idOffset, nVertices, stride, pointSize, renderPhase, viewport,
+        lineWidth) _uniformCache;
 #endif
 };
 
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index 681c4e14d0..a80152e3eb 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -129,8 +129,9 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableTrailOrbit::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_renderabletrailorbit";
+    documentation::Documentation doc = codegen::doc<Parameters>(
+        "base_renderable_renderabletrailorbit"
+    );
 
     // Insert the parents documentation entries until we have a verifier that can deal
     // with class hierarchy
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index ecd770c3ea..061e4de74b 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -105,8 +105,9 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableTrailTrajectory::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_renderable_renderabletrailtrajectory";
+    documentation::Documentation doc = codegen::doc<Parameters>(
+        "base_renderable_renderabletrailtrajectory"
+    );
 
     // @TODO cleanup
     // Insert the parents documentation entries until we have a verifier that can deal
diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 4cb9cf591b..5c3ebae6eb 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -128,9 +128,7 @@ int removeDashboardItemsFromScreenSpace(lua_State* L) {
 } // namespace luascriptfunctions
 
 documentation::Documentation ScreenSpaceDashboard::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_screenspace_dashboard";
-    return doc;
+    return codegen::doc<Parameters>("base_screenspace_dashboard");
 }
 
 ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index 3c74143c2f..d4cf2672c6 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -32,6 +32,7 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureconversion.h>
+#include <filesystem>
 #include <optional>
 
 namespace {
@@ -57,9 +58,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation ScreenSpaceImageLocal::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_screenspace_image_local";
-    return doc;
+    return codegen::doc<Parameters>("base_screenspace_image_local");
 }
 
 ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary)
@@ -81,7 +80,7 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
     setIdentifier(identifier);
 
     _texturePath.onChange([this]() {
-        if (!FileSys.fileExists(FileSys.absolutePath(_texturePath))) {
+        if (!std::filesystem::is_regular_file(absPath(_texturePath))) {
             LWARNINGC(
                 "ScreenSpaceImageLocal",
                 fmt::format("Image {} did not exist for {}", _texturePath, _identifier)
@@ -94,8 +93,8 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
     addProperty(_texturePath);
 
     if (p.texturePath.has_value()) {
-        if (FileSys.fileExists(FileSys.absolutePath(*p.texturePath))) {
-            _texturePath = FileSys.absolutePath(*p.texturePath);
+        if (std::filesystem::is_regular_file(absPath(*p.texturePath))) {
+            _texturePath = absPath(*p.texturePath).string();
         }
         else {
             LWARNINGC(
@@ -115,7 +114,7 @@ bool ScreenSpaceImageLocal::deinitializeGL() {
 void ScreenSpaceImageLocal::update() {
     if (_textureIsDirty && !_texturePath.value().empty()) {
         std::unique_ptr<ghoul::opengl::Texture> texture =
-            ghoul::io::TextureReader::ref().loadTexture(absPath(_texturePath));
+            ghoul::io::TextureReader::ref().loadTexture(absPath(_texturePath).string());
 
         if (texture) {
             // Images don't need to start on 4-byte boundaries, for example if the
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index ef5c527175..8219965b11 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -58,9 +58,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation ScreenSpaceImageOnline::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_screenspace_image_online";
-    return doc;
+    return codegen::doc<Parameters>("base_screenspace_image_online");
 }
 
 ScreenSpaceImageOnline::ScreenSpaceImageOnline(const ghoul::Dictionary& dictionary)
@@ -81,8 +79,8 @@ ScreenSpaceImageOnline::ScreenSpaceImageOnline(const ghoul::Dictionary& dictiona
     setIdentifier(std::move(identifier));
 
     _texturePath.onChange([this]() { _textureIsDirty = true; });
-    addProperty(_texturePath);
     _texturePath = p.url.value_or(_texturePath);
+    addProperty(_texturePath);
 }
 
 ScreenSpaceImageOnline::~ScreenSpaceImageOnline() {} // NOLINT
diff --git a/modules/base/rotation/constantrotation.cpp b/modules/base/rotation/constantrotation.cpp
index d72f524f40..cd14fdddc2 100644
--- a/modules/base/rotation/constantrotation.cpp
+++ b/modules/base/rotation/constantrotation.cpp
@@ -55,9 +55,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation ConstantRotation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_transform_rotation_constant";
-    return doc;
+    return codegen::doc<Parameters>("base_transform_rotation_constant");
 }
 
 ConstantRotation::ConstantRotation(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp
index c89e4dc489..0182155221 100644
--- a/modules/base/rotation/fixedrotation.cpp
+++ b/modules/base/rotation/fixedrotation.cpp
@@ -46,7 +46,7 @@ namespace {
     };
 
     constexpr const openspace::properties::Property::PropertyInfo XAxisTypeInfo = {
-        "xAxis-Type",
+        "xAxisType",
         "xAxis: Specification Type",
         "This value specifies how this axis is being specified, that is whether it is "
         "referencing another object, specifying an absolute vector, or whether it is "
@@ -55,7 +55,7 @@ namespace {
     };
 
     constexpr const openspace::properties::Property::PropertyInfo YAxisTypeInfo = {
-        "yAxis-Type",
+        "yAxisType",
         "yAxis: Specification Type",
         "This value specifies how this axis is being specified, that is whether it is "
         "referencing another object, specifying an absolute vector, or whether it is "
@@ -64,7 +64,7 @@ namespace {
     };
 
     constexpr const openspace::properties::Property::PropertyInfo ZAxisTypeInfo = {
-        "zAxis-Type",
+        "zAxisType",
         "zAxis: Specification Type",
         "This value specifies how this axis is being specified, that is whether it is "
         "referencing another object, specifying an absolute vector, or whether it is "
@@ -73,7 +73,7 @@ namespace {
     };
 
     constexpr const openspace::properties::Property::PropertyInfo XAxisObjectInfo = {
-        "xAxis-Object",
+        "xAxisObject",
         "xAxis: Focus Object",
         "This is the object that the axis will focus on. This object must name an "
         "existing scene graph node in the currently loaded scene and the rotation will "
@@ -81,7 +81,7 @@ namespace {
     };
 
     constexpr const openspace::properties::Property::PropertyInfo YAxisObjectInfo = {
-        "yAxis-Object",
+        "yAxisObject",
         "yAxis: Focus Object",
         "This is the object that the axis will focus on. This object must name an "
         "existing scene graph node in the currently loaded scene and the rotation will "
@@ -89,7 +89,7 @@ namespace {
     };
 
     constexpr const openspace::properties::Property::PropertyInfo ZAxisObjectInfo = {
-        "zAxis-Object",
+        "zAxisObject",
         "zAxis: Focus Object",
         "This is the object that the axis will focus on. This object must name an "
         "existing scene graph node in the currently loaded scene and the rotation will "
@@ -98,7 +98,7 @@ namespace {
 
     constexpr const openspace::properties::Property::PropertyInfo XAxisInvertObjectInfo =
     {
-        "xAxis-InvertObject",
+        "xAxisInvertObject",
         "xAxis: Invert Object Point Direction",
         "If this value is set to 'true', and the type is set to 'Object', the inverse of "
         "the pointing direction is used, causing the object to point away from the "
@@ -107,7 +107,7 @@ namespace {
 
     constexpr const openspace::properties::Property::PropertyInfo YAxisInvertObjectInfo =
     {
-        "yAxis-InvertObject",
+        "yAxisInvertObject",
         "yAxis: Invert Object Point Direction",
         "If this value is set to 'true', and the type is set to 'Object', the inverse of "
         "the pointing direction is used, causing the object to point away from the "
@@ -116,7 +116,7 @@ namespace {
 
     constexpr const openspace::properties::Property::PropertyInfo ZAxisInvertObjectInfo =
     {
-        "zAxis-InvertObject",
+        "zAxisInvertObject",
         "zAxis: Invert Object Point Direction",
         "If this value is set to 'true', and the type is set to 'Object', the inverse of "
         "the pointing direction is used, causing the object to point away from the "
@@ -124,21 +124,21 @@ namespace {
     };
 
     constexpr const openspace::properties::Property::PropertyInfo XAxisVectorInfo = {
-        "xAxis-Vector",
+        "xAxisVector",
         "xAxis: Direction vector",
         "This value specifies a static direction vector that is used for a fixed "
         "rotation."
     };
 
     constexpr const openspace::properties::Property::PropertyInfo YAxisVectorInfo = {
-        "yAxis-Vector",
+        "yAxisVector",
         "yAxis: Direction vector",
         "This value specifies a static direction vector that is used for a fixed "
         "rotation."
     };
 
     constexpr const openspace::properties::Property::PropertyInfo ZAxisVectorInfo = {
-        "zAxis-Vector",
+        "zAxisVector",
         "zAxis: Direction vector",
         "This value specifies a static direction vector that is used for a fixed "
         "rotation."
@@ -147,7 +147,7 @@ namespace {
     constexpr const openspace::properties::Property::PropertyInfo
     XAxisOrthogonalVectorInfo =
     {
-        "xAxis-Orthogonal",
+        "xAxisOrthogonal",
         "xAxis: Vector is orthogonal",
         "This value determines whether the vector specified is used directly, or whether "
         "it is used together with another non-coordinate system completion vector to "
@@ -157,7 +157,7 @@ namespace {
     constexpr const openspace::properties::Property::PropertyInfo
     YAxisOrthogonalVectorInfo =
     {
-        "yAxis-Orthogonal",
+        "yAxisOrthogonal",
         "yAxis: Vector is orthogonal",
         "This value determines whether the vector specified is used directly, or whether "
         "it is used together with another non-coordinate system completion vector to "
@@ -167,7 +167,7 @@ namespace {
     constexpr const openspace::properties::Property::PropertyInfo
     ZAxisOrthogonalVectorInfo =
     {
-        "zAxis-Orthogonal",
+        "zAxisOrthogonal",
         "zAxis: Vector is orthogonal",
         "This value determines whether the vector specified is used directly, or whether "
         "it is used together with another non-coordinate system completion vector to "
@@ -194,7 +194,7 @@ namespace {
         std::optional<bool> xAxisOrthogonal;
 
         // [[codegen::verbatim(XAxisInvertObjectInfo.description)]]
-        std::optional<bool> xAxisInvert [[codegen::key("xAxis - InvertObject")]];
+        std::optional<bool> xAxisInvert;
 
         // This value specifies the direction of the new Y axis. If this value is not
         // specified, it will be computed by completing a right handed coordinate system
@@ -207,7 +207,7 @@ namespace {
         std::optional<bool> yAxisOrthogonal;
 
         // [[codegen::verbatim(YAxisInvertObjectInfo.description)]]
-        std::optional<bool> yAxisInvert [[codegen::key("yAxis - InvertObject")]];
+        std::optional<bool> yAxisInvert;
 
         // This value specifies the direction of the new Z axis. If this value is not
         // specified, it will be computed by completing a right handed coordinate system
@@ -220,7 +220,7 @@ namespace {
         std::optional<bool> zAxisOrthogonal;
 
         // [[codegen::verbatim(ZAxisInvertObjectInfo.description)]]
-        std::optional<bool> zAxisInvert [[codegen::key("zAxis - InvertObject")]];
+        std::optional<bool> zAxisInvert;
 
         // [[codegen::verbatim(AttachedInfo.description)]]
         std::optional<std::string> attached;
@@ -231,9 +231,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation FixedRotation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_transform_rotation_fixed";
-    return doc;
+    return codegen::doc<Parameters>("base_transform_rotation_fixed");
 }
 
 FixedRotation::FixedRotation(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index f6f0f822a5..86d9e8d619 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -56,9 +56,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation LuaRotation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_transform_rotation_lua";
-    return doc;
+    return codegen::doc<Parameters>("base_transform_rotation_lua");
 }
 
 LuaRotation::LuaRotation()
@@ -69,17 +67,15 @@ LuaRotation::LuaRotation()
 
     _luaScriptFile.onChange([&]() {
         requireUpdate();
-        _fileHandle = std::make_unique<ghoul::filesystem::File>(_luaScriptFile);
-        _fileHandle->setCallback([&](const ghoul::filesystem::File&) {
-            requireUpdate();
-        });
+        _fileHandle = std::make_unique<ghoul::filesystem::File>(_luaScriptFile.value());
+        _fileHandle->setCallback([this]() { requireUpdate(); });
     });
 }
 
 LuaRotation::LuaRotation(const ghoul::Dictionary& dictionary) : LuaRotation() {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _luaScriptFile = absPath(p.script);
+    _luaScriptFile = absPath(p.script).string();
 }
 
 glm::dmat3 LuaRotation::matrix(const UpdateData& data) const {
diff --git a/modules/base/rotation/staticrotation.cpp b/modules/base/rotation/staticrotation.cpp
index 1da7e72f6f..550453f55e 100644
--- a/modules/base/rotation/staticrotation.cpp
+++ b/modules/base/rotation/staticrotation.cpp
@@ -67,9 +67,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation StaticRotation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_transform_rotation_static";
-    return doc;
+    return codegen::doc<Parameters>("base_transform_rotation_static");
 }
 
 StaticRotation::StaticRotation()
diff --git a/modules/base/rotation/timelinerotation.cpp b/modules/base/rotation/timelinerotation.cpp
index 8a60f99c8b..aa96c4b0eb 100644
--- a/modules/base/rotation/timelinerotation.cpp
+++ b/modules/base/rotation/timelinerotation.cpp
@@ -42,9 +42,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation TimelineRotation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_transform_rotation_keyframe";
-    return doc;
+    return codegen::doc<Parameters>("base_transform_rotation_keyframe");
 }
 
 TimelineRotation::TimelineRotation(const ghoul::Dictionary& dictionary) {
diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp
index 8ea195e15c..f99600595e 100644
--- a/modules/base/scale/luascale.cpp
+++ b/modules/base/scale/luascale.cpp
@@ -55,9 +55,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation LuaScale::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_scale_lua";
-    return doc;
+    return codegen::doc<Parameters>("base_scale_lua");
 }
 
 LuaScale::LuaScale()
@@ -68,16 +66,14 @@ LuaScale::LuaScale()
 
     _luaScriptFile.onChange([&]() {
         requireUpdate();
-        _fileHandle = std::make_unique<ghoul::filesystem::File>(_luaScriptFile);
-        _fileHandle->setCallback([&](const ghoul::filesystem::File&) {
-            requireUpdate();
-        });
+        _fileHandle = std::make_unique<ghoul::filesystem::File>(_luaScriptFile.value());
+        _fileHandle->setCallback([this]() { requireUpdate(); });
     });
 }
 
 LuaScale::LuaScale(const ghoul::Dictionary& dictionary) : LuaScale() {
     const Parameters p = codegen::bake<Parameters>(dictionary);
-    _luaScriptFile = absPath(p.script);
+    _luaScriptFile = absPath(p.script).string();
 }
 
 glm::dvec3 LuaScale::scaleValue(const UpdateData& data) const {
diff --git a/modules/base/scale/nonuniformstaticscale.cpp b/modules/base/scale/nonuniformstaticscale.cpp
index 19bc7ca349..62229c511c 100644
--- a/modules/base/scale/nonuniformstaticscale.cpp
+++ b/modules/base/scale/nonuniformstaticscale.cpp
@@ -45,9 +45,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation NonUniformStaticScale::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_scale_nonuniformstatic";
-    return doc;
+    return codegen::doc<Parameters>("base_scale_nonuniformstatic");
 }
 
 glm::dvec3 NonUniformStaticScale::scaleValue(const UpdateData&) const {
diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp
index 59b5a96c57..57f5643e99 100644
--- a/modules/base/scale/staticscale.cpp
+++ b/modules/base/scale/staticscale.cpp
@@ -45,9 +45,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation StaticScale::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_scale_static";
-    return doc;
+    return codegen::doc<Parameters>("base_scale_static");
 }
 
 glm::dvec3 StaticScale::scaleValue(const UpdateData&) const {
diff --git a/modules/base/scale/timedependentscale.cpp b/modules/base/scale/timedependentscale.cpp
index 168146ef0c..567faef012 100644
--- a/modules/base/scale/timedependentscale.cpp
+++ b/modules/base/scale/timedependentscale.cpp
@@ -71,9 +71,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation TimeDependentScale::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_scale_timedependent";
-    return doc;
+    return codegen::doc<Parameters>("base_scale_timedependent");
 }
 
 TimeDependentScale::TimeDependentScale(const ghoul::Dictionary& dictionary)
diff --git a/modules/base/shaders/axes_fs.glsl b/modules/base/shaders/axes_fs.glsl
index 6bbcd9b84b..912657481c 100644
--- a/modules/base/shaders/axes_fs.glsl
+++ b/modules/base/shaders/axes_fs.glsl
@@ -35,7 +35,7 @@ uniform vec3 zColor;
 Fragment getFragment() {
     Fragment frag;
 
-    vec3 colorComponents = step(0.01f, vs_positionModelSpace);
+    vec3 colorComponents = step(0.01, vs_positionModelSpace);
 
     frag.color.rgb = colorComponents.x * xColor +
         colorComponents.y * yColor +
diff --git a/modules/base/shaders/axes_vs.glsl b/modules/base/shaders/axes_vs.glsl
index b7d5caae03..539b4ddd18 100644
--- a/modules/base/shaders/axes_vs.glsl
+++ b/modules/base/shaders/axes_vs.glsl
@@ -37,7 +37,7 @@ void main() {
     vec4 positionViewSpace = modelViewTransform * vec4(in_position, 1.0);
     vec4 positionClipSpace = projectionTransform * positionViewSpace;
     vec4 positionScreenSpace = positionClipSpace;
-    positionScreenSpace.z = 0.f;
+    positionScreenSpace.z = 0.0;
     vs_positionModelSpace = in_position;
     vs_screenSpaceDepth  = positionScreenSpace.w;
     vs_positionViewSpace = positionViewSpace;
diff --git a/modules/base/shaders/grid_fs.glsl b/modules/base/shaders/grid_fs.glsl
index 06d83fa764..0046d605d1 100644
--- a/modules/base/shaders/grid_fs.glsl
+++ b/modules/base/shaders/grid_fs.glsl
@@ -33,13 +33,12 @@ uniform float opacity;
 Fragment getFragment() {
     Fragment frag;
     frag.color.rgb = gridColor;
-    frag.color.a   = opacity;
-    frag.depth     = vs_depthClipSpace;
+    frag.color.a = opacity;
+    frag.depth = vs_depthClipSpace;
     frag.gPosition = vs_positionViewSpace;
 
     // There is no normal here
     frag.gNormal = vec4(0.0, 0.0, -1.0, 1.0);
 
     return frag;
-
 }
diff --git a/modules/base/shaders/grid_vs.glsl b/modules/base/shaders/grid_vs.glsl
index 30351ea566..755eb91e0a 100644
--- a/modules/base/shaders/grid_vs.glsl
+++ b/modules/base/shaders/grid_vs.glsl
@@ -33,13 +33,13 @@ uniform dmat4 modelViewTransform;
 uniform dmat4 MVPTransform;
 
 void main() {
-    dvec4 objPosDouble      = dvec4(in_position, 1.0);
+    dvec4 objPosDouble = dvec4(in_position, 1.0);
     dvec4 positionViewSpace = modelViewTransform * objPosDouble;
     dvec4 positionClipSpace = MVPTransform * objPosDouble;
     
     positionClipSpace.z = 0.0;
     
-    vs_depthClipSpace    = float(positionClipSpace.w);
+    vs_depthClipSpace = float(positionClipSpace.w);
     vs_positionViewSpace = vec4(positionViewSpace);
     
     gl_Position = vec4(positionClipSpace);
diff --git a/modules/base/shaders/line_fs.glsl b/modules/base/shaders/line_fs.glsl
index 0045d65d15..7d60291b6d 100644
--- a/modules/base/shaders/line_fs.glsl
+++ b/modules/base/shaders/line_fs.glsl
@@ -23,7 +23,6 @@
  ****************************************************************************************/
 
 #include "fragment.glsl"
-#include "floatoperations.glsl"
 
 in float vs_depth;
 in vec4 vs_positionViewSpace;
diff --git a/modules/base/shaders/plane_fs.glsl b/modules/base/shaders/plane_fs.glsl
index b11a3da7bc..b70c9a0ebd 100644
--- a/modules/base/shaders/plane_fs.glsl
+++ b/modules/base/shaders/plane_fs.glsl
@@ -24,10 +24,10 @@
 
 #include "fragment.glsl"
 
-in float vs_screenSpaceDepth;
-in vec2 vs_st;
 in vec4 vs_gPosition;
 in vec3 vs_gNormal;
+in float vs_screenSpaceDepth;
+in vec2 vs_st;
 
 uniform sampler2D texture1;
 uniform bool additiveBlending;
@@ -57,8 +57,8 @@ Fragment getFragment() {
     }
 
     // G-Buffer
-    frag.gPosition  = vs_gPosition;
-    frag.gNormal    = vec4(vs_gNormal, 1.0);
+    frag.gPosition = vs_gPosition;
+    frag.gNormal = vec4(vs_gNormal, 1.0);
 
     return frag;
 }
diff --git a/modules/base/shaders/plane_vs.glsl b/modules/base/shaders/plane_vs.glsl
index e93dd95a92..a3af07c14e 100644
--- a/modules/base/shaders/plane_vs.glsl
+++ b/modules/base/shaders/plane_vs.glsl
@@ -29,12 +29,10 @@
 layout(location = 0) in vec4 in_position;
 layout(location = 1) in vec2 in_st;
 
-out vec2 vs_st;
-out float vs_screenSpaceDepth;
-out vec4 vs_positionScreenSpace;
-// G-Buffer
 out vec4 vs_gPosition;
 out vec3 vs_gNormal;
+out float vs_screenSpaceDepth;
+out vec2 vs_st;
 
 uniform mat4 modelViewProjectionTransform;
 uniform mat4 modelViewTransform;
diff --git a/modules/atmosphere/shaders/inScattering_calc_vs.glsl b/modules/base/shaders/prism_fs.glsl
similarity index 92%
rename from modules/atmosphere/shaders/inScattering_calc_vs.glsl
rename to modules/base/shaders/prism_fs.glsl
index 1ca953fe3c..e659f56f6a 100644
--- a/modules/atmosphere/shaders/inScattering_calc_vs.glsl
+++ b/modules/base/shaders/prism_fs.glsl
@@ -22,10 +22,15 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#version __CONTEXT__
+#include "fragment.glsl"
 
-layout(location = 0) in vec3 in_position;
+in float vs_depth;
 
-void main() {
-    gl_Position = vec4(in_position, 1.0);
+uniform vec4 vs_color;
+
+Fragment getFragment() {
+  Fragment frag;
+  frag.color = vs_color;
+  frag.depth = vs_depth;
+  return frag;
 }
diff --git a/modules/atmosphere/shaders/inScattering_calc_gs.glsl b/modules/base/shaders/prism_vs.glsl
similarity index 84%
rename from modules/atmosphere/shaders/inScattering_calc_gs.glsl
rename to modules/base/shaders/prism_vs.glsl
index 823cd6a71e..bb8d4f68b0 100644
--- a/modules/atmosphere/shaders/inScattering_calc_gs.glsl
+++ b/modules/base/shaders/prism_vs.glsl
@@ -24,16 +24,18 @@
 
 #version __CONTEXT__
 
-uniform int layer;
+#include "PowerScaling/powerScaling_vs.hglsl"
 
-layout (triangles) in;
-layout (triangle_strip, max_vertices=3) out;
+layout (location = 0) in vec3 in_position;
+
+out float vs_depth;
+
+uniform mat4 modelViewProjectionTransform;
 
 void main() {
-    for (int n = 0; n < gl_in.length(); ++n) {
-        gl_Position = gl_in[n].gl_Position;
-        gl_Layer    = layer;
-        EmitVertex();
-    }
-    EndPrimitive();
+  vec4 position = vec4(in_position, 1.0);
+  vec4 positionClipSpace = modelViewProjectionTransform * position;
+  vec4 positionScreenSpace = z_normalization(positionClipSpace);
+  gl_Position = positionScreenSpace;
+  vs_depth = positionScreenSpace.w;
 }
diff --git a/modules/base/shaders/renderabletrail_fs.glsl b/modules/base/shaders/renderabletrail_fs.glsl
index 27e1402b06..c5c370c108 100644
--- a/modules/base/shaders/renderabletrail_fs.glsl
+++ b/modules/base/shaders/renderabletrail_fs.glsl
@@ -34,12 +34,13 @@ uniform int renderPhase;
 uniform float opacity = 1.0;
 uniform float lineWidth;
 
+uniform vec4 viewport;
+
 // Fragile! Keep in sync with RenderableTrail::render::RenderPhase 
-#define RenderPhaseLines 0
-#define RenderPhasePoints 1
-
-#define Delta 0.25
+const int RenderPhaseLines = 0;
+const int RenderPhasePoints = 1;
 
+const float Delta = 0.25;
 
 Fragment getFragment() {
     Fragment frag;
@@ -61,18 +62,21 @@ Fragment getFragment() {
         frag.color.a = transparencyCorrection;
     }
 
-    double distanceCenter = length(mathLine - vec2(gl_FragCoord.xy));
+    // We can't expect a viewport of the form (0, 0, res.x, res.y) used to convert the
+    // window coordinates from gl_FragCoord into [0, 1] coordinates, so we need to use
+    // this more complicated method that is also used in the FXAA and HDR rendering steps
+    vec2 xy = vec2(gl_FragCoord.xy);
+    xy -= viewport.xy;
+
+    double distanceCenter = length(mathLine - xy);
     double dLW = double(lineWidth);
-    float blendFactor = 20;
+    const float blendFactor = 20.0;
     
     if (distanceCenter > dLW) {
         frag.color.a = 0.0;
-        //discard;
     }
     else {
         frag.color.a *= pow(float((dLW - distanceCenter) / dLW), blendFactor);
-        // if (frag.color.a < 0.4)
-        //     discard;
     }
 
     frag.gPosition = vs_gPosition;
diff --git a/modules/base/shaders/renderabletrail_vs.glsl b/modules/base/shaders/renderabletrail_vs.glsl
index 3a6b56ce62..f2615fa74c 100644
--- a/modules/base/shaders/renderabletrail_vs.glsl
+++ b/modules/base/shaders/renderabletrail_vs.glsl
@@ -43,14 +43,13 @@ uniform int vertexSortingMethod;
 uniform int pointSize;
 uniform int stride;
 
-uniform ivec2 resolution;
+uniform vec4 viewport;
 
 // Fragile! Keep in sync with RenderableTrail::render
 #define VERTEX_SORTING_NEWESTFIRST 0
 #define VERTEX_SORTING_OLDESTFIRST 1
 #define VERTEX_SORTING_NOSORTING 2
 
-
 void main() {
     int modId = gl_VertexID;
 
@@ -83,5 +82,5 @@ void main() {
                     float(pointSize) : float(pointSize) / 2;
     gl_Position  = z_normalization(vs_positionClipSpace);
 
-    mathLine = 0.5 * (vs_positionNDC.xy + vec2(1.0)) * vec2(resolution);
+    mathLine = 0.5 * (vs_positionNDC.xy + vec2(1.0)) * viewport.zw;
 }
diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index 7c0f7e1b57..0d36c6ef4f 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -26,21 +26,20 @@
 #include "PowerScaling/powerScaling_fs.hglsl"
 
 in vec2 vs_st;
-in vec4 vs_position;
+in float vs_depth;
 
-uniform sampler2D texture1;
-uniform float Alpha;
+uniform sampler2D tex;
+uniform vec3 color = vec3(1.0, 1.0, 1.0);
+uniform float opacity = 1.0;
 
 Fragment getFragment() {
-    Fragment frag;
+  Fragment frag;
 
-    frag.color = texture(texture1, vs_st);
-    frag.color.a = Alpha * frag.color.a;
-    if (frag.color.a == 0.0) {
-        discard;
-    }
+  frag.color = texture(tex, vs_st) * vec4(color, opacity);
+  if (frag.color.a == 0.0) {
+    discard;
+  }
 
-    frag.depth = vs_position.z;
-
-    return frag;
+  frag.depth = vs_depth;
+  return frag;
 }
diff --git a/modules/base/shaders/screenspace_vs.glsl b/modules/base/shaders/screenspace_vs.glsl
index 2f057ce33d..4932574f04 100644
--- a/modules/base/shaders/screenspace_vs.glsl
+++ b/modules/base/shaders/screenspace_vs.glsl
@@ -28,14 +28,13 @@ layout(location = 0) in vec3 in_position;
 layout(location = 1) in vec2 in_st;
 
 out vec2 vs_st;
-out vec4 vs_position;
-
-uniform mat4 ModelTransform;
-uniform mat4 ViewProjectionMatrix;
+out float vs_depth;
 
+uniform mat4 mvpMatrix;
 
 void main() {
-    vs_st = in_st;
-    vs_position = ViewProjectionMatrix * ModelTransform * vec4(in_position, 1.0);
-    gl_Position = vec4(vs_position);
+  vs_st = in_st;
+  vec4 p = mvpMatrix * vec4(in_position, 1.0);
+  vs_depth = p.z;
+  gl_Position = vec4(p);
 }
diff --git a/modules/base/shaders/sphere_fs.glsl b/modules/base/shaders/sphere_fs.glsl
index 0a3a97acec..33b5374993 100644
--- a/modules/base/shaders/sphere_fs.glsl
+++ b/modules/base/shaders/sphere_fs.glsl
@@ -23,13 +23,11 @@
  ****************************************************************************************/
 
 #include "fragment.glsl"
-#include "PowerScaling/powerScaling_fs.hglsl"
 
 in vec4 vs_position;
 in vec2 vs_textureCoords;
 in vec3 vs_normal;
 
-uniform float time;
 uniform sampler2D colorTexture;
 uniform float opacity;
 uniform bool mirrorTexture;
diff --git a/modules/base/shaders/sphere_vs.glsl b/modules/base/shaders/sphere_vs.glsl
index 873646d23a..99e4a11973 100644
--- a/modules/base/shaders/sphere_vs.glsl
+++ b/modules/base/shaders/sphere_vs.glsl
@@ -42,5 +42,5 @@ void main() {
     vs_position = position;
 
     // Set z to 0 to disable near/far-plane clipping
-    gl_Position =  vec4(position.xy, 0.0, position.w);
+    gl_Position = vec4(position.xy, 0.0, position.w);
 }
diff --git a/modules/base/timeframe/timeframeinterval.cpp b/modules/base/timeframe/timeframeinterval.cpp
index e0a18079b2..01606bb174 100644
--- a/modules/base/timeframe/timeframeinterval.cpp
+++ b/modules/base/timeframe/timeframeinterval.cpp
@@ -68,9 +68,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation TimeFrameInterval::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_time_frame_interval";
-    return doc;
+    return codegen::doc<Parameters>("base_time_frame_interval");
 }
 
 bool TimeFrameInterval::isActive(const Time& time) const {
diff --git a/modules/base/timeframe/timeframeunion.cpp b/modules/base/timeframe/timeframeunion.cpp
index b630f940ea..2b6204af04 100644
--- a/modules/base/timeframe/timeframeunion.cpp
+++ b/modules/base/timeframe/timeframeunion.cpp
@@ -50,13 +50,11 @@ namespace {
 namespace openspace {
 
 documentation::Documentation TimeFrameUnion::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_time_frame_union";
-    return doc;
+    return codegen::doc<Parameters>("base_time_frame_union");
 }
 
 bool TimeFrameUnion::isActive(const Time& time) const {
-    for (const auto& tf : _timeFrames) {
+    for (const ghoul::mm_unique_ptr<TimeFrame>& tf : _timeFrames) {
         if (tf->isActive(time)) {
             return true;
         }
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index 8f850d1f28..2f853e8394 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -56,9 +56,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation LuaTranslation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_transform_translation_lua";
-    return doc;
+    return codegen::doc<Parameters>("base_transform_translation_lua");
 }
 
 LuaTranslation::LuaTranslation()
@@ -69,8 +67,8 @@ LuaTranslation::LuaTranslation()
 
     _luaScriptFile.onChange([&]() {
         requireUpdate();
-        _fileHandle = std::make_unique<ghoul::filesystem::File>(_luaScriptFile);
-        _fileHandle->setCallback([&](const ghoul::filesystem::File&) {
+        _fileHandle = std::make_unique<ghoul::filesystem::File>(_luaScriptFile.value());
+        _fileHandle->setCallback([this]() {
              requireUpdate();
              notifyObservers();
          });
@@ -79,7 +77,7 @@ LuaTranslation::LuaTranslation()
 
 LuaTranslation::LuaTranslation(const ghoul::Dictionary& dictionary) : LuaTranslation() {
     const Parameters p = codegen::bake<Parameters>(dictionary);
-    _luaScriptFile = absPath(p.script);
+    _luaScriptFile = absPath(p.script).string();
 }
 
 glm::dvec3 LuaTranslation::position(const UpdateData& data) const {
diff --git a/modules/base/translation/statictranslation.cpp b/modules/base/translation/statictranslation.cpp
index b4987cccf3..228d6a7d62 100644
--- a/modules/base/translation/statictranslation.cpp
+++ b/modules/base/translation/statictranslation.cpp
@@ -45,9 +45,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation StaticTranslation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_transform_translation_static";
-    return doc;
+    return codegen::doc<Parameters>("base_transform_translation_static");
 }
 
 StaticTranslation::StaticTranslation()
@@ -58,7 +56,7 @@ StaticTranslation::StaticTranslation()
         glm::dvec3(std::numeric_limits<double>::max())
     )
 {
-    _position.setViewOption(properties::Property::ViewOptions::Logarithmic);
+    _position.setExponent(20.f);
     addProperty(_position);
 
     _position.onChange([this]() {
diff --git a/modules/base/translation/timelinetranslation.cpp b/modules/base/translation/timelinetranslation.cpp
index 6067f91c5b..defe7e9eab 100644
--- a/modules/base/translation/timelinetranslation.cpp
+++ b/modules/base/translation/timelinetranslation.cpp
@@ -42,9 +42,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation TimelineTranslation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_transform_translation_keyframe";
-    return doc;
+    return codegen::doc<Parameters>("base_transform_translation_keyframe");
 }
 
 TimelineTranslation::TimelineTranslation(const ghoul::Dictionary& dictionary) {
diff --git a/modules/cefwebgui/shaders/gui_fs.glsl b/modules/cefwebgui/shaders/gui_fs.glsl
index 08a149d55a..1a08596b5e 100644
--- a/modules/cefwebgui/shaders/gui_fs.glsl
+++ b/modules/cefwebgui/shaders/gui_fs.glsl
@@ -24,12 +24,11 @@
 
 #version __CONTEXT__
 
-in vec2 Texcoord;
-
+in vec2 vs_st;
 out vec4 outputColor;
 
 uniform sampler2D tex;
 
 void main() {
-  outputColor = texture(tex, Texcoord);
+  outputColor = texture(tex, vs_st);
 }
diff --git a/modules/cefwebgui/shaders/gui_vs.glsl b/modules/cefwebgui/shaders/gui_vs.glsl
index 6044288f45..88ee25ef02 100644
--- a/modules/cefwebgui/shaders/gui_vs.glsl
+++ b/modules/cefwebgui/shaders/gui_vs.glsl
@@ -25,13 +25,12 @@
 #version __CONTEXT__
 
 layout(location = 0) in vec2 position;
+out vec2 vs_st;
 
 uniform mat4 ortho;
 
-out vec2 Texcoord;
-
 void main() {
-  Texcoord = vec2(position.x + 1.0f, position.y + 1.0f) * 0.5;
+  vs_st = vec2(position.x + 1.0, position.y + 1.0) * 0.5;
   gl_Position = vec4(position, 0.0, 1.0);
 }
 
diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp
index 335e48b3b7..57f6958257 100644
--- a/modules/debugging/rendering/renderabledebugplane.cpp
+++ b/modules/debugging/rendering/renderabledebugplane.cpp
@@ -100,9 +100,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableDebugPlane::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "debugging_renderable_debugplane";
-    return doc;
+    return codegen::doc<Parameters>("debugging_renderable_debugplane");
 }
 
 RenderableDebugPlane::RenderableDebugPlane(const ghoul::Dictionary& dictionary)
@@ -117,7 +115,7 @@ RenderableDebugPlane::RenderableDebugPlane(const ghoul::Dictionary& dictionary)
     _texture = p.texture.value_or(_texture);
     addProperty(_texture);
 
-    _size.setViewOption(properties::Property::ViewOptions::Logarithmic);
+    _size.setExponent(15.f);
     _size.onChange([this](){ _planeIsDirty = true; });
     _size = p.size.value_or(_size);
     setBoundingSphere(_size);
diff --git a/modules/digitaluniverse/CMakeLists.txt b/modules/digitaluniverse/CMakeLists.txt
index 8eb459ec5e..b8abefa7da 100644
--- a/modules/digitaluniverse/CMakeLists.txt
+++ b/modules/digitaluniverse/CMakeLists.txt
@@ -41,12 +41,6 @@ set(SOURCE_FILES
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  shaders/pointssprite_fs.glsl
-  shaders/pointssprite_vs.glsl
-  shaders/points_sprite_fs.glsl
-  shaders/points_fs.glsl
-  shaders/points_gs.glsl
-  shaders/points_vs.glsl
   shaders/billboard_fs.glsl
   shaders/billboard_gs.glsl
   shaders/billboard_vs.glsl
@@ -57,6 +51,8 @@ set(SHADER_FILES
   shaders/dumesh_fs.glsl
   shaders/plane_vs.glsl
   shaders/plane_fs.glsl
+  shaders/points_sprite_fs.glsl
+  shaders/points_vs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
index 3da6f82553..a0aa0c4f33 100644
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
+++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
@@ -33,22 +33,23 @@
 #include <openspace/rendering/renderengine.h>
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/misc/crc32.h>
-#include <ghoul/misc/templatefactory.h>
+#include <ghoul/font/fontmanager.h>
+#include <ghoul/font/fontrenderer.h>
+#include <ghoul/glm.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/crc32.h>
+#include <ghoul/misc/templatefactory.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
-#include <ghoul/font/fontmanager.h>
-#include <ghoul/font/fontrenderer.h>
-#include <ghoul/glm.h>
 #include <glm/gtx/string_cast.hpp>
 #include <array>
-#include <fstream>
 #include <cstdint>
+#include <filesystem>
+#include <fstream>
 #include <locale>
 #include <optional>
 #include <string>
@@ -66,7 +67,6 @@ namespace {
         "hasColorMap", "enabledRectSizeControl", "hasDvarScaling"
     };
 
-    constexpr int8_t CurrentCacheVersion = 1;
     constexpr double PARSEC = 0.308567756E17;
 
     constexpr const int RenderOptionViewDirection = 0;
@@ -116,18 +116,11 @@ namespace {
         "The text size for the astronomical object labels."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelMinSizeInfo = {
-        "TextMinSize",
-        "Text Min Size",
-        "The minimal size (in pixels) of the text for the labels for the astronomical "
-        "objects being rendered."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo LabelMaxSizeInfo = {
-        "TextMaxSize",
-        "Text Max Size",
-        "The maximum size (in pixels) of the text for the labels for the astronomical "
-        "objects being rendered."
+    constexpr openspace::properties::Property::PropertyInfo LabelMinMaxSizeInfo = {
+        "TextMinMaxSize",
+        "Text Min/Max Size",
+        "The minimal and maximal size (in pixels) of the text for the labels for the "
+        "astronomical objects being rendered."
     };
 
     constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = {
@@ -178,48 +171,43 @@ namespace {
 
     constexpr openspace::properties::Property::PropertyInfo DisableFadeInInfo = {
         "DisableFadeIn",
-        "Disable Fade-in effect",
+        "Disable Fade-in Effect",
         "Enables/Disables the Fade-in effect."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo BillboardMaxSizeInfo = {
-        "BillboardMaxSize",
-        "Billboard Max Size in Pixels",
-        "The max size (in pixels) for the billboard representing the astronomical "
-        "object."
+    constexpr openspace::properties::Property::PropertyInfo PixelSizeControlInfo = {
+        "EnablePixelSizeControl",
+        "Enable Pixel Size Control",
+        "Enable pixel size control for rectangular projections. If set to true, the "
+        "billboard size is restricted by the min/max size in pixels property."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo BillboardMinSizeInfo = {
-        "BillboardMinSize",
-        "Billboard Min Size in Pixels",
-        "The min size (in pixels) for the billboard representing the astronomical "
-        "object."
+    constexpr openspace::properties::Property::PropertyInfo BillboardMinMaxSizeInfo = {
+        "BillboardMinMaxSize",
+        "Billboard Min/Max Size in Pixels",
+        "The minimum and maximum size (in pixels) for the billboard representing the "
+        "astronomical object."
     };
 
     constexpr openspace::properties::Property::PropertyInfo
-    CorrectionSizeEndDistanceInfo = {
+        CorrectionSizeEndDistanceInfo =
+    {
         "CorrectionSizeEndDistance",
-        "Distance in 10^X meters where correction size stops acting.",
+        "Distance in 10^X meters where correction size stops acting",
         "Distance in 10^X meters where correction size stops acting."
     };
 
     constexpr openspace::properties::Property::PropertyInfo CorrectionSizeFactorInfo = {
         "CorrectionSizeFactor",
-        "Control variable for distance size.",
+        "Control variable for distance size",
         ""
     };
 
-    constexpr openspace::properties::Property::PropertyInfo PixelSizeControlInfo = {
-        "EnablePixelSizeControl",
-        "Enable pixel size control.",
-        "Enable pixel size control for rectangular projections."
-    };
-
     constexpr openspace::properties::Property::PropertyInfo UseLinearFiltering = {
         "UseLinearFiltering",
         "Use Linear Filtering",
         "Determines whether the provided color map should be sampled nearest neighbor "
-        "(=off) or linearly (=on"
+        "(=off) or linearly (=on)"
     };
 
     constexpr openspace::properties::Property::PropertyInfo SetRangeFromData = {
@@ -258,6 +246,8 @@ namespace {
             Gigaparsec [[codegen::key("Gpc")]],
             GigalightYears [[codegen::key("Gly")]]
         };
+        // The unit used for all distances. Must match the unit of any
+        // distances/positions in the data files
         std::optional<Unit> unit;
 
         // [[codegen::verbatim(ScaleFactorInfo.description)]]
@@ -289,11 +279,8 @@ namespace {
         // objects being rendered
         std::optional<std::string> labelFile;
 
-        // [[codegen::verbatim(LabelMinSizeInfo.description)]]
-        std::optional<float> textMinSize;
-
-        // [[codegen::verbatim(LabelMaxSizeInfo.description)]]
-        std::optional<float> textMaxSize;
+        // [[codegen::verbatim(LabelMinMaxSizeInfo.description)]]
+        std::optional<glm::ivec2> textMinMaxSize;
 
         // [[codegen::verbatim(ColorOptionInfo.description)]]
         std::optional<std::vector<std::string>> colorOption;
@@ -314,11 +301,8 @@ namespace {
         // [[codegen::verbatim(DisableFadeInInfo.description)]]
         std::optional<bool> disableFadeIn;
 
-        // [[codegen::verbatim(BillboardMaxSizeInfo.description)]]
-        std::optional<float> billboardMaxSize;
-
-        // [[codegen::verbatim(BillboardMinSizeInfo.description)]]
-        std::optional<float> billboardMinSize;
+        // [[codegen::verbatim(BillboardMinMaxSizeInfo.description)]]
+        std::optional<glm::vec2> billboardMinMaxSize;
 
         // [[codegen::verbatim(CorrectionSizeEndDistanceInfo.description)]]
         std::optional<float> correctionSizeEndDistance;
@@ -338,9 +322,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableBillboardsCloud::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "digitaluniverse_RenderableBillboardsCloud";
-    return doc;
+    return codegen::doc<Parameters>("digitaluniverse_RenderableBillboardsCloud");
 }
 
 RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& dictionary)
@@ -351,27 +333,34 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
     , _textColor(TextColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _textOpacity(TextOpacityInfo, 1.f, 0.f, 1.f)
     , _textSize(TextSizeInfo, 8.f, 0.5f, 24.f)
-    , _textMinSize(LabelMinSizeInfo, 8.f, 0.5f, 24.f)
-    , _textMaxSize(LabelMaxSizeInfo, 20.f, 0.5f, 100.f)
+    , _textMinMaxSize(
+        LabelMinMaxSizeInfo,
+        glm::ivec2(8, 20),
+        glm::ivec2(0),
+        glm::ivec2(100)
+    )
     , _drawElements(DrawElementsInfo, true)
     , _drawLabels(DrawLabelInfo, false)
     , _pixelSizeControl(PixelSizeControlInfo, false)
     , _colorOption(ColorOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _optionColorRangeData(OptionColorRangeInfo, glm::vec2(0.f))
-
     , _datavarSizeOption(
         SizeOptionInfo,
         properties::OptionProperty::DisplayType::Dropdown
     )
-    , _fadeInDistance(
+    , _fadeInDistances(
         FadeInDistancesInfo,
         glm::vec2(0.f),
         glm::vec2(0.f),
         glm::vec2(100.f)
     )
     , _disableFadeInDistance(DisableFadeInInfo, true)
-    , _billboardMaxSize(BillboardMaxSizeInfo, 400.f, 0.f, 1000.f)
-    , _billboardMinSize(BillboardMinSizeInfo, 0.f, 0.f, 100.f)
+    , _billboardMinMaxSize(
+        BillboardMinMaxSizeInfo,
+        glm::vec2(0.f, 400.f),
+        glm::vec2(0.f),
+        glm::vec2(1000.f)
+    )
     , _correctionSizeEndDistance(CorrectionSizeEndDistanceInfo, 17.f, 12.f, 25.f)
     , _correctionSizeFactor(CorrectionSizeFactorInfo, 8.f, 0.f, 20.f)
     , _useLinearFiltering(UseLinearFiltering, false)
@@ -381,7 +370,7 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     if (p.file.has_value()) {
-        _speckFile = absPath(*p.file);
+        _speckFile = absPath(*p.file).string();
     }
     _hasSpeckFile = p.file.has_value();
 
@@ -433,24 +422,23 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
         }
     }
     else {
-        LWARNING("No unit given for RenderableBillboardsCloud. Using meters as units.");
+        LWARNING("No unit given for RenderableBillboardsCloud. Using meters as units");
         _unit = Meter;
     }
 
     if (p.texture.has_value()) {
-        _spriteTexturePath = absPath(*p.texture);
+        _spriteTexturePath = absPath(*p.texture).string();
         _spriteTexturePath.onChange([&]() { _spriteTextureIsDirty = true; });
 
         // @TODO (abock, 2021-01-31) I don't know why we only add this property if the
         // texture is given, but I think it's a bug
+        // @TODO (emmbr, 2021-05-24) This goes for several properties in this renderable
         addProperty(_spriteTexturePath);
-
     }
     _hasSpriteTexture = p.texture.has_value();
 
-
     if (p.colorMap.has_value()) {
-        _colorMapFile = absPath(*p.colorMap);
+        _colorMapFile = absPath(*p.colorMap).string();
         _hasColorMapFile = true;
 
         if (p.colorOption.has_value()) {
@@ -517,7 +505,7 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
         _drawLabels = p.drawLabels.value_or(_drawLabels);
         addProperty(_drawLabels);
 
-        _labelFile = absPath(*p.labelFile);
+        _labelFile = absPath(*p.labelFile).string();
         _hasLabel = true;
 
         _textColor = p.textColor.value_or(_textColor);
@@ -532,28 +520,28 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
         _textSize = p.textSize.value_or(_textSize);
         addProperty(_textSize);
 
-        _textMinSize = p.textMinSize.value_or(_textMinSize);
-        addProperty(_textMinSize);
-
-        _textMaxSize = p.textMaxSize.value_or(_textMaxSize);
-        addProperty(_textMaxSize);
+        _textMinMaxSize = p.textMinMaxSize.value_or(_textMinMaxSize);
+        _textMinMaxSize.setViewOption(properties::Property::ViewOptions::MinMaxRange);
+        addProperty(_textMinMaxSize);
     }
 
     _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 
     if (p.fadeInDistances.has_value()) {
-        _fadeInDistance = *p.fadeInDistances;
-        addProperty(_fadeInDistance);
+        _fadeInDistances = *p.fadeInDistances;
+        _fadeInDistances.setViewOption(properties::Property::ViewOptions::MinMaxRange);
+        addProperty(_fadeInDistances);
 
         _disableFadeInDistance = false;
         addProperty(_disableFadeInDistance);
     }
 
-    _billboardMaxSize = p.billboardMaxSize.value_or(_billboardMaxSize);
-    addProperty(_billboardMaxSize);
+    _pixelSizeControl = p.enablePixelSizeControl.value_or(_pixelSizeControl);
+    addProperty(_pixelSizeControl);
 
-    _billboardMinSize = p.billboardMinSize.value_or(_billboardMinSize);
-    addProperty(_billboardMinSize);
+    _billboardMinMaxSize = p.billboardMinMaxSize.value_or(_billboardMinMaxSize);
+    _billboardMinMaxSize.setViewOption(properties::Property::ViewOptions::MinMaxRange);
+    addProperty(_billboardMinMaxSize);
 
     _correctionSizeEndDistance =
         p.correctionSizeEndDistance.value_or(_correctionSizeEndDistance);
@@ -564,21 +552,16 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
         addProperty(_correctionSizeFactor);
     }
 
-    _pixelSizeControl = p.enablePixelSizeControl.value_or(_pixelSizeControl);
-    if (p.enablePixelSizeControl.has_value()) {
-        addProperty(_pixelSizeControl);
-    }
-
     _setRangeFromData.onChange([this]() {
         const int colorMapInUse =
-            _hasColorMapFile ? _variableDataPositionMap[_colorOptionString] : 0;
+            _hasColorMapFile ? _dataset.index(_colorOptionString) : 0;
 
         float minValue = std::numeric_limits<float>::max();
-        float maxValue = std::numeric_limits<float>::min();
-        for (size_t i = 0; i < _fullData.size(); i += _nValuesPerAstronomicalObject) {
-            float colorIdx = _fullData[i + 3 + colorMapInUse];
-            maxValue = colorIdx >= maxValue ? colorIdx : maxValue;
-            minValue = colorIdx < minValue ? colorIdx : minValue;
+        float maxValue = -std::numeric_limits<float>::max();
+        for (const speck::Dataset::Entry& e : _dataset.entries) {
+            float color = e.data[colorMapInUse];
+            minValue = std::min(minValue, color);
+            maxValue = std::max(maxValue, color);
         }
 
         _optionColorRangeData = glm::vec2(minValue, maxValue);
@@ -591,15 +574,25 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
 }
 
 bool RenderableBillboardsCloud::isReady() const {
-    return ((_program != nullptr) && (!_fullData.empty())) || (!_labelData.empty());
+    return (_program && (!_dataset.entries.empty())) || (!_labelset.entries.empty());
 }
 
 void RenderableBillboardsCloud::initialize() {
     ZoneScoped
 
-    bool success = loadData();
-    if (!success) {
-        throw ghoul::RuntimeError("Error loading data");
+    if (_hasSpeckFile) {
+        _dataset = speck::data::loadFileWithCache(_speckFile);
+    }
+
+    if (_hasColorMapFile) {
+        _colorMap = speck::color::loadFileWithCache(_colorMapFile);
+    }
+
+    if (!_labelFile.empty()) {
+        _labelset = speck::label::loadFileWithCache(_labelFile);
+        for (speck::Labelset::Entry& e : _labelset.entries) {
+            e.position = glm::vec3(_transformationMatrix * glm::dvec4(e.position, 1.0));
+        }
     }
 
     if (!_colorOptionString.empty() && (_colorRangeData.size() > 1)) {
@@ -645,7 +638,7 @@ void RenderableBillboardsCloud::initializeGL() {
     }
 
     if (_hasLabel) {
-        if (_font == nullptr) {
+        if (!_font) {
             size_t _fontSize = 50;
             _font = global::fontManager->font(
                 "Mono",
@@ -714,8 +707,11 @@ void RenderableBillboardsCloud::renderBillboards(const RenderData& data,
             glm::dmat4(data.camera.projectionMatrix()) * data.camera.combinedViewMatrix()
         )
     );
-    _program->setUniform(_uniformCache.minBillboardSize, _billboardMinSize); // in pixels
-    _program->setUniform(_uniformCache.maxBillboardSize, _billboardMaxSize); // in pixels
+
+    const float minBillboardSize = _billboardMinMaxSize.value().x; // in pixels
+    const float maxBillboardSize = _billboardMinMaxSize.value().y; // in pixels
+    _program->setUniform(_uniformCache.minBillboardSize, minBillboardSize);
+    _program->setUniform(_uniformCache.maxBillboardSize, maxBillboardSize);
     _program->setUniform(_uniformCache.color, _pointColor);
     _program->setUniform(_uniformCache.alphaValue, _opacity);
     _program->setUniform(_uniformCache.scaleFactor, _scaleFactor);
@@ -749,11 +745,7 @@ void RenderableBillboardsCloud::renderBillboards(const RenderData& data,
     _program->setUniform(_uniformCache.hasColormap, _hasColorMapFile);
 
     glBindVertexArray(_vao);
-    const GLsizei nAstronomicalObjects = static_cast<GLsizei>(
-        _fullData.size() / _nValuesPerAstronomicalObject
-    );
-    glDrawArrays(GL_POINTS, 0, nAstronomicalObjects);
-
+    glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_dataset.entries.size()));
     glBindVertexArray(0);
     _program->deactivate();
 
@@ -767,16 +759,13 @@ void RenderableBillboardsCloud::renderLabels(const RenderData& data,
                                              const glm::dvec3& orthoUp,
                                              float fadeInVariable)
 {
-    glm::vec4 textColor = glm::vec4(
-        glm::vec3(_textColor),
-        _textOpacity * fadeInVariable
-    );
+    glm::vec4 textColor = glm::vec4(glm::vec3(_textColor), _textOpacity * fadeInVariable);
 
     ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo;
     labelInfo.orthoRight = orthoRight;
     labelInfo.orthoUp = orthoUp;
-    labelInfo.minSize = static_cast<int>(_textMinSize);
-    labelInfo.maxSize = static_cast<int>(_textMaxSize);
+    labelInfo.minSize = _textMinMaxSize.value().x;
+    labelInfo.maxSize = _textMinMaxSize.value().y;
     labelInfo.cameraPos = data.camera.positionVec3();
     labelInfo.cameraLookUp = data.camera.lookUpVectorWorldSpace();
     labelInfo.renderType = _renderOption;
@@ -785,14 +774,13 @@ void RenderableBillboardsCloud::renderLabels(const RenderData& data,
     labelInfo.enableDepth = true;
     labelInfo.enableFalseDepth = false;
 
-    for (const std::pair<glm::vec3, std::string>& pair : _labelData) {
-        //glm::vec3 scaledPos(_transformationMatrix * glm::dvec4(pair.first, 1.0));
-        glm::vec3 scaledPos(pair.first);
+    for (const speck::Labelset::Entry& e : _labelset.entries) {
+        glm::vec3 scaledPos(e.position);
         scaledPos *= unitToMeter(_unit);
         ghoul::fontrendering::FontRenderer::defaultProjectionRenderer().render(
             *_font,
             scaledPos,
-            pair.second,
+            e.text,
             textColor,
             labelInfo
         );
@@ -800,14 +788,16 @@ void RenderableBillboardsCloud::renderLabels(const RenderData& data,
 }
 
 void RenderableBillboardsCloud::render(const RenderData& data, RendererTasks&) {
-    float fadeInVariable = 1.f;
+    float fadeInVar = 1.f;
     if (!_disableFadeInDistance) {
         float distCamera = static_cast<float>(glm::length(data.camera.positionVec3()));
-        const glm::vec2 fadeRange = _fadeInDistance;
-        const float a = 1.f / ((fadeRange.y - fadeRange.x) * unitToMeter(_unit));
+        const glm::vec2 fadeRange = _fadeInDistances;
+        const float a = static_cast<float>(
+            1.f / ((fadeRange.y - fadeRange.x) * unitToMeter(_unit))
+        );
         const float b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
         const float funcValue = a * distCamera + b;
-        fadeInVariable *= funcValue > 1.f ? 1.f : funcValue;
+        fadeInVar *= funcValue > 1.f ? 1.f : funcValue;
 
         if (funcValue < 0.01f) {
             return;
@@ -840,23 +830,11 @@ void RenderableBillboardsCloud::render(const RenderData& data, RendererTasks&) {
     glm::dvec3 orthoUp = glm::normalize(glm::cross(cameraViewDirectionWorld, orthoRight));
 
     if (_hasSpeckFile && _drawElements) {
-        renderBillboards(
-            data,
-            modelMatrix,
-            orthoRight,
-            orthoUp,
-            fadeInVariable
-        );
+        renderBillboards(data, modelMatrix, orthoRight, orthoUp, fadeInVar);
     }
 
     if (_drawLabels && _hasLabel) {
-        renderLabels(
-            data,
-            modelViewProjectionMatrix,
-            orthoRight,
-            orthoUp,
-            fadeInVariable
-        );
+        renderLabels(data, modelViewProjectionMatrix, orthoRight, orthoUp, fadeInVar);
     }
 }
 
@@ -868,9 +846,9 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
         TracyGpuZone("Data dirty")
         LDEBUG("Regenerating data");
 
-        createDataSlice();
+        std::vector<float> slice = createDataSlice();
 
-        int size = static_cast<int>(_slicedData.size());
+        int size = static_cast<int>(slice.size());
 
         if (_vao == 0) {
             glGenVertexArrays(1, &_vao);
@@ -883,12 +861,7 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
 
         glBindVertexArray(_vao);
         glBindBuffer(GL_ARRAY_BUFFER, _vbo);
-        glBufferData(
-            GL_ARRAY_BUFFER,
-            size * sizeof(float),
-            &_slicedData[0],
-            GL_STATIC_DRAW
-        );
+        glBufferData(GL_ARRAY_BUFFER, size * sizeof(float), slice.data(), GL_STATIC_DRAW);
         GLint positionAttrib = _program->attributeLocation("in_position");
 
         if (_hasColorMapFile && _hasDatavarSize) {
@@ -898,7 +871,7 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
                 4,
                 GL_FLOAT,
                 GL_FALSE,
-                sizeof(float) * 9,
+                9 * sizeof(float),
                 nullptr
             );
 
@@ -909,8 +882,8 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
                 4,
                 GL_FLOAT,
                 GL_FALSE,
-                sizeof(float) * 9,
-                reinterpret_cast<void*>(sizeof(float) * 4)
+                9 * sizeof(float),
+                reinterpret_cast<void*>(4 * sizeof(float))
             );
 
             GLint dvarScalingAttrib = _program->attributeLocation("in_dvarScaling");
@@ -920,8 +893,8 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
                 1,
                 GL_FLOAT,
                 GL_FALSE,
-                sizeof(float) * 9,
-                reinterpret_cast<void*>(sizeof(float) * 8)
+                9 * sizeof(float),
+                reinterpret_cast<void*>(8 * sizeof(float))
             );
         }
         else if (_hasColorMapFile) {
@@ -931,7 +904,7 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
                 4,
                 GL_FLOAT,
                 GL_FALSE,
-                sizeof(float) * 8,
+                8 * sizeof(float),
                 nullptr
             );
 
@@ -942,8 +915,8 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
                 4,
                 GL_FLOAT,
                 GL_FALSE,
-                sizeof(float) * 8,
-                reinterpret_cast<void*>(sizeof(float) * 4)
+                8 * sizeof(float),
+                reinterpret_cast<void*>(4 * sizeof(float))
             );
         }
         else if (_hasDatavarSize) {
@@ -953,7 +926,7 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
                 4,
                 GL_FLOAT,
                 GL_FALSE,
-                sizeof(float) * 8,
+                8 * sizeof(float),
                 nullptr
             );
 
@@ -964,8 +937,8 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
                 1,
                 GL_FLOAT,
                 GL_FALSE,
-                sizeof(float) * 5,
-                reinterpret_cast<void*>(sizeof(float) * 4)
+                5 * sizeof(float),
+                reinterpret_cast<void*>(4 * sizeof(float))
             );
         }
         else {
@@ -999,7 +972,7 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
             [path = _spriteTexturePath]() -> std::unique_ptr<ghoul::opengl::Texture> {
                 LINFO(fmt::format("Loaded texture from '{}'", absPath(path)));
                 std::unique_ptr<ghoul::opengl::Texture> t =
-                    ghoul::io::TextureReader::ref().loadTexture(absPath(path));
+                    ghoul::io::TextureReader::ref().loadTexture(absPath(path).string());
                 t->uploadTexture();
                 t->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
                 t->purgeFromRAM();
@@ -1012,434 +985,9 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
     }
 }
 
-bool RenderableBillboardsCloud::loadData() {
-    bool success = true;
-
-    success &= loadSpeckData();
-
-    if (_hasColorMapFile) {
-        if (!_hasSpeckFile) {
-            success = true;
-        }
-        success &= readColorMapFile();
-    }
-
-    success &= loadLabelData();
-
-    return success;
-}
-
-bool RenderableBillboardsCloud::loadSpeckData() {
-    if (!_hasSpeckFile) {
-        return true;
-    }
-    bool success = true;
-    const std::string& cachedFile = FileSys.cacheManager()->cachedFilename(
-        ghoul::filesystem::File(_speckFile),
-        "RenderableDUMeshes|" + identifier(),
-        ghoul::filesystem::CacheManager::Persistent::Yes
-    );
-
-    const bool hasCachedFile = FileSys.fileExists(cachedFile);
-    if (hasCachedFile) {
-        LINFO(fmt::format(
-            "Cached file '{}' used for Speck file '{}'",
-            cachedFile, _speckFile
-        ));
-
-        success = loadCachedFile(cachedFile);
-        if (success) {
-            return true;
-        }
-        else {
-            FileSys.cacheManager()->removeCacheFile(_speckFile);
-            // Intentional fall-through to the 'else' to generate the cache
-            // file for the next run
-        }
-    }
-    else {
-        LINFO(fmt::format("Cache for Speck file '{}' not found", _speckFile));
-    }
-    LINFO(fmt::format("Loading Speck file '{}'", _speckFile));
-
-    success = readSpeckFile();
-    if (!success) {
-        return false;
-    }
-
-    success &= saveCachedFile(cachedFile);
-    return success;
-}
-
-bool RenderableBillboardsCloud::loadLabelData() {
-    if (_labelFile.empty()) {
-        return true;
-    }
-    bool success = true;
-    // I disabled the cache as it didn't work on Mac --- abock
-    const std::string& cachedFile = FileSys.cacheManager()->cachedFilename(
-        ghoul::filesystem::File(_labelFile),
-        ghoul::filesystem::CacheManager::Persistent::Yes
-    );
-    if (!_hasSpeckFile && !_hasColorMapFile) {
-        success = true;
-    }
-    const bool hasCachedFile = FileSys.fileExists(cachedFile);
-    if (hasCachedFile) {
-        LINFO(fmt::format(
-            "Cached file '{}' used for Label file '{}'",
-            cachedFile, _labelFile
-        ));
-
-        success &= loadCachedFile(cachedFile);
-        if (!success) {
-            FileSys.cacheManager()->removeCacheFile(_labelFile);
-            // Intentional fall-through to the 'else' to generate the cache
-            // file for the next run
-        }
-    }
-    else {
-        LINFO(fmt::format("Cache for Label file '{}' not found", _labelFile));
-        LINFO(fmt::format("Loading Label file '{}'", _labelFile));
-
-        success &= readLabelFile();
-        if (!success) {
-            return false;
-        }
-    }
-
-    return success;
-}
-
-bool RenderableBillboardsCloud::readSpeckFile() {
-    std::ifstream file(_speckFile);
-    if (!file.good()) {
-        LERROR(fmt::format("Failed to open Speck file '{}'", _speckFile));
-        return false;
-    }
-
-    _nValuesPerAstronomicalObject = 0;
-
-    // The beginning of the speck file has a header that either contains comments
-    // (signaled by a preceding '#') or information about the structure of the file
-    // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
-    std::string line;
-    while (true) {
-        std::getline(file, line);
-
-        // Guard against wrong line endings (copying files from Windows to Mac) causes
-        // lines to have a final \r
-        if (!line.empty() && line.back() == '\r') {
-            line = line.substr(0, line.length() - 1);
-        }
-
-        if (line.empty() || line[0] == '#') {
-            continue;
-        }
-
-        if (line.substr(0, 7) != "datavar" &&
-            line.substr(0, 10) != "texturevar" &&
-            line.substr(0, 7) != "texture" &&
-            line.substr(0, 10) != "polyorivar" &&
-            line.substr(0, 10) != "maxcomment")
-        {
-            // Started reading data
-            break;
-        }
-
-        if (line.substr(0, 7) == "datavar") {
-            // datavar lines are structured as follows:
-            // datavar # description
-            // where # is the index of the data variable; so if we repeatedly overwrite
-            // the 'nValues' variable with the latest index, we will end up with the total
-            // number of values (+3 since X Y Z are not counted in the Speck file index)
-            std::stringstream str(line);
-
-            std::string dummy;
-            str >> dummy; // command
-            str >> _nValuesPerAstronomicalObject; // variable index
-            dummy.clear();
-            str >> dummy; // variable name
-
-            _variableDataPositionMap.insert({ dummy, _nValuesPerAstronomicalObject });
-
-            // We want the number, but the index is 0 based
-            _nValuesPerAstronomicalObject += 1;
-        }
-    }
-
-    _nValuesPerAstronomicalObject += 3; // X Y Z are not counted in the Speck file indices
-
-
-
-    do {
-        // Guard against wrong line endings (copying files from Windows to Mac) causes
-        // lines to have a final \r
-        if (!line.empty() && line.back() == '\r') {
-            line = line.substr(0, line.length() - 1);
-        }
-
-        if (line.empty()) {
-            std::getline(file, line);
-            continue;
-        }
-        else if (line[0] == '#') {
-            std::getline(file, line);
-            continue;
-        }
-
-        std::stringstream str(line);
-        std::vector<float> values(_nValuesPerAstronomicalObject);
-
-        for (int i = 0; i < _nValuesPerAstronomicalObject; ++i) {
-            str >> values[i];
-        }
-
-        _fullData.insert(_fullData.end(), values.begin(), values.end());
-
-        // reads new line
-        std::getline(file, line);
-    } while (!file.eof());
-
-    return true;
-}
-
-bool RenderableBillboardsCloud::readColorMapFile() {
-    std::string _file = _colorMapFile;
-    std::ifstream file(_file);
-    if (!file.good()) {
-        LERROR(fmt::format("Failed to open Color Map file '{}'", _file));
-        return false;
-    }
-
-    std::size_t numberOfColors = 0;
-
-    // The beginning of the speck file has a header that either contains comments
-    // (signaled by a preceding '#') or information about the structure of the file
-    // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
-    std::string line;
-    while (true) {
-        // std::streampos position = file.tellg();
-        std::getline(file, line);
-
-        if (line[0] == '#' || line.empty()) {
-            continue;
-        }
-
-        // Initial number of colors
-        std::locale loc;
-        if (std::isdigit(line[0], loc)) {
-            std::string::size_type sz;
-            numberOfColors = std::stoi(line, &sz);
-            break;
-        }
-        else if (file.eof()) {
-            return false;
-        }
-    }
-
-    for (size_t i = 0; i < numberOfColors; ++i) {
-        std::getline(file, line);
-        std::stringstream str(line);
-
-        glm::vec4 color;
-        // Each color in the colormap must be defined as (R,G,B,A)
-        for (int j = 0; j < 4; ++j) {
-            str >> color[j];
-        }
-
-        _colorMapData.push_back(color);
-    }
-
-    return true;
-}
-
-bool RenderableBillboardsCloud::readLabelFile() {
-    std::string _file = _labelFile;
-    std::ifstream file(_file);
-    if (!file.good()) {
-        LERROR(fmt::format("Failed to open Label file '{}'", _file));
-        return false;
-    }
-
-    // The beginning of the speck file has a header that either contains comments
-    // (signaled by a preceding '#') or information about the structure of the file
-    // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
-    std::string line;
-    while (true) {
-        std::streampos position = file.tellg();
-        std::getline(file, line);
-
-        // Guard against wrong line endings (copying files from Windows to Mac) causes
-        // lines to have a final \r
-        if (!line.empty() && line.back() == '\r') {
-            line = line.substr(0, line.length() - 1);
-        }
-
-        if (line.empty() || line[0] == '#') {
-            continue;
-        }
-
-        if (line.substr(0, 9) != "textcolor") {
-            // we read a line that doesn't belong to the header, so we have to jump back
-            // before the beginning of the current line
-            file.seekg(position);
-            continue;
-        }
-
-        if (line.substr(0, 9) == "textcolor") {
-            // textcolor lines are structured as follows:
-            // textcolor # description
-            // where # is color text defined in configuration file
-            std::stringstream str(line);
-
-            // TODO: handle cases of labels with different colors
-            break;
-        }
-    }
-
-
-    do {
-        std::vector<float> values(_nValuesPerAstronomicalObject);
-
-        std::getline(file, line);
-
-        // Guard against wrong line endings (copying files from Windows to Mac) causes
-        // lines to have a final \r
-        if (!line.empty() && line.back() == '\r') {
-            line = line.substr(0, line.length() - 1);
-        }
-
-        if (line.empty()) {
-            continue;
-        }
-
-        std::stringstream str(line);
-
-        glm::vec3 position = glm::vec3(0.f);
-        for (int j = 0; j < 3; ++j) {
-            str >> position[j];
-        }
-
-        std::string dummy;
-        str >> dummy; // text keyword
-
-        std::string label;
-        str >> label;
-        dummy.clear();
-
-        while (str >> dummy) {
-            if (dummy == "#") {
-                break;
-            }
-
-            label += " " + dummy;
-            dummy.clear();
-        }
-
-        glm::vec3 transformedPos = glm::vec3(
-            _transformationMatrix * glm::dvec4(position, 1.0)
-        );
-        _labelData.emplace_back(std::make_pair(transformedPos, label));
-    } while (!file.eof());
-
-    return true;
-}
-
-bool RenderableBillboardsCloud::loadCachedFile(const std::string& file) {
-    std::ifstream fileStream(file, std::ifstream::binary);
-    if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
-        return false;
-    }
-    int8_t version = 0;
-    fileStream.read(reinterpret_cast<char*>(&version), sizeof(int8_t));
-    if (version != CurrentCacheVersion) {
-        LINFO("The format of the cached file has changed: deleting old cache");
-        fileStream.close();
-        FileSys.deleteFile(file);
-        return false;
-    }
-
-    int32_t nValues = 0;
-    fileStream.read(reinterpret_cast<char*>(&nValues), sizeof(int32_t));
-    fileStream.read(
-        reinterpret_cast<char*>(&_nValuesPerAstronomicalObject),
-        sizeof(int32_t)
-    );
-
-    _fullData.resize(nValues);
-    fileStream.read(
-        reinterpret_cast<char*>(&_fullData[0]),
-        nValues * sizeof(_fullData[0])
-    );
-
-    if (_hasColorMapFile) {
-        int32_t nItems = 0;
-        fileStream.read(reinterpret_cast<char*>(&nItems), sizeof(int32_t));
-
-        for (int i = 0; i < nItems; ++i) {
-            int32_t keySize = 0;
-            fileStream.read(reinterpret_cast<char*>(&keySize), sizeof(int32_t));
-            std::vector<char> buffer(keySize);
-            fileStream.read(buffer.data(), keySize);
-
-            std::string key(buffer.begin(), buffer.end());
-            int32_t value = 0;
-            fileStream.read(reinterpret_cast<char*>(&value), sizeof(int32_t));
-
-            _variableDataPositionMap.insert({ key, value });
-        }
-    }
-
-    bool success = fileStream.good();
-    return success;
-}
-
-bool RenderableBillboardsCloud::saveCachedFile(const std::string& file) const {
-    std::ofstream fileStream(file, std::ofstream::binary);
-    if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file '{}' for save cache file", file));
-        return false;
-    }
-    fileStream.write(reinterpret_cast<const char*>(&CurrentCacheVersion), sizeof(int8_t));
-
-    int32_t nValues = static_cast<int32_t>(_fullData.size());
-    if (nValues == 0) {
-        LERROR("Error writing cache: No values were loaded");
-        return false;
-    }
-    fileStream.write(reinterpret_cast<const char*>(&nValues), sizeof(int32_t));
-
-    int32_t nValuesPerAstronomicalObject = static_cast<int32_t>(
-        _nValuesPerAstronomicalObject
-    );
-    fileStream.write(
-        reinterpret_cast<const char*>(&nValuesPerAstronomicalObject),
-        sizeof(int32_t)
-    );
-
-    size_t nBytes = nValues * sizeof(_fullData[0]);
-    fileStream.write(reinterpret_cast<const char*>(&_fullData[0]), nBytes);
-
-    if (_hasColorMapFile) {
-        int32_t nItems = static_cast<int32_t>(_variableDataPositionMap.size());
-        fileStream.write(reinterpret_cast<const char*>(&nItems), sizeof(int32_t));
-
-        for (const std::pair<const std::string, int>& pair : _variableDataPositionMap) {
-            int32_t keySize = static_cast<int32_t>(pair.first.size());
-            fileStream.write(reinterpret_cast<const char*>(&keySize), sizeof(int32_t));
-            fileStream.write(pair.first.data(), keySize);
-            int32_t value = static_cast<int32_t>(pair.second);
-            fileStream.write(reinterpret_cast<const char*>(&value), sizeof(int32_t));
-        }
-    }
-
-    return fileStream.good();
-}
-
 double RenderableBillboardsCloud::unitToMeter(Unit unit) const {
-    switch (_unit) {
+    // @TODO (abock, 2021-05-10)  This should be moved to a centralized conversion code
+    switch (unit) {
         case Meter:          return 1.0;
         case Kilometer:      return 1e3;
         case Parsec:         return PARSEC;
@@ -1451,76 +999,58 @@ double RenderableBillboardsCloud::unitToMeter(Unit unit) const {
     }
 }
 
-void RenderableBillboardsCloud::createDataSlice() {
+std::vector<float> RenderableBillboardsCloud::createDataSlice() {
     ZoneScoped
 
-    _slicedData.clear();
-
-    if (_fullData.empty() || _nValuesPerAstronomicalObject == 0) {
-        return;
+    if (_dataset.entries.empty()) {
+        return std::vector<float>();
     }
 
+    std::vector<float> result;
     if (_hasColorMapFile) {
-        _slicedData.reserve(8 * (_fullData.size() / _nValuesPerAstronomicalObject));
+        result.reserve(8 * _dataset.entries.size());
     }
     else {
-        _slicedData.reserve(4 * (_fullData.size() / _nValuesPerAstronomicalObject));
+        result.reserve(4 * _dataset.entries.size());
     }
 
     // what datavar in use for the index color
-    int colorMapInUse =
-        _hasColorMapFile ? _variableDataPositionMap[_colorOptionString] : 0;
+    int colorMapInUse = _hasColorMapFile ? _dataset.index(_colorOptionString) : 0;
 
     // what datavar in use for the size scaling (if present)
-    int sizeScalingInUse = _hasDatavarSize ?
-        _variableDataPositionMap[_datavarSizeOptionString] : -1;
-
-    auto addDatavarSizeScalling = [&](size_t i, int datavarInUse) {
-        _slicedData.push_back(_fullData[i + 3 + datavarInUse]);
-    };
-
-    auto addPosition = [&](const glm::vec4& pos) {
-        for (int j = 0; j < 4; ++j) {
-            _slicedData.push_back(pos[j]);
-        }
-    };
+    int sizeScalingInUse =
+        _hasDatavarSize ? _dataset.index(_datavarSizeOptionString) : -1;
 
     float minColorIdx = std::numeric_limits<float>::max();
-    float maxColorIdx = std::numeric_limits<float>::min();
-
-    for (size_t i = 0; i < _fullData.size(); i += _nValuesPerAstronomicalObject) {
-        float colorIdx = _fullData[i + 3 + colorMapInUse];
-        maxColorIdx = colorIdx >= maxColorIdx ? colorIdx : maxColorIdx;
-        minColorIdx = colorIdx < minColorIdx ? colorIdx : minColorIdx;
+    float maxColorIdx = -std::numeric_limits<float>::max();
+    for (const speck::Dataset::Entry& e : _dataset.entries) {
+        float color = e.data[colorMapInUse];
+        minColorIdx = std::min(color, minColorIdx);
+        maxColorIdx = std::max(color, maxColorIdx);
     }
 
     double maxRadius = 0.0;
 
     float biggestCoord = -1.f;
-    for (size_t i = 0; i < _fullData.size(); i += _nValuesPerAstronomicalObject) {
+    for (const speck::Dataset::Entry& e : _dataset.entries) {
         glm::vec3 transformedPos = glm::vec3(_transformationMatrix * glm::vec4(
-            _fullData[i + 0],
-            _fullData[i + 1],
-            _fullData[i + 2],
-            1.0
+            e.position, 1.0
         ));
         glm::vec4 position(transformedPos, static_cast<float>(_unit));
 
         const double unitMeter = unitToMeter(_unit);
         glm::dvec3 p = glm::dvec3(position) * unitMeter;
         const double r = glm::length(p);
-        if (r > maxRadius) {
-            maxRadius = r;
-        }
+        maxRadius = std::max(maxRadius, r);
 
         if (_hasColorMapFile) {
             for (int j = 0; j < 4; ++j) {
-                _slicedData.push_back(position[j]);
-                biggestCoord = biggestCoord < position[j] ? position[j] : biggestCoord;
+                result.push_back(position[j]);
             }
+            biggestCoord = std::max(biggestCoord, glm::compMax(position));
             // Note: if exact colormap option is not selected, the first color and the
             // last color in the colormap file are the outliers colors.
-            float variableColor = _fullData[i + 3 + colorMapInUse];
+            float variableColor = e.data[colorMapInUse];
 
             float cmax, cmin;
             if (_colorRangeData.empty()) {
@@ -1536,39 +1066,37 @@ void RenderableBillboardsCloud::createDataSlice() {
             if (_isColorMapExact) {
                 int colorIndex = variableColor + cmin;
                 for (int j = 0; j < 4; ++j) {
-                    _slicedData.push_back(_colorMapData[colorIndex][j]);
+                    result.push_back(_colorMap.entries[colorIndex][j]);
                 }
             }
             else {
                 if (_useLinearFiltering) {
-                    const float value = variableColor;
-
-                    float valueT = (value - cmin) / (cmax - cmin); // in [0, 1)
+                    float valueT = (variableColor - cmin) / (cmax - cmin); // in [0, 1)
                     valueT = std::clamp(valueT, 0.f, 1.f);
 
-                    const float idx = valueT * (_colorMapData.size() - 1);
+                    const float idx = valueT * (_colorMap.entries.size() - 1);
                     const int floorIdx = static_cast<int>(std::floor(idx));
                     const int ceilIdx = static_cast<int>(std::ceil(idx));
 
-                    const glm::vec4 floorColor = _colorMapData[floorIdx];
-                    const glm::vec4 ceilColor = _colorMapData[ceilIdx];
+                    const glm::vec4 floorColor = _colorMap.entries[floorIdx];
+                    const glm::vec4 ceilColor = _colorMap.entries[ceilIdx];
 
                     if (floorColor != ceilColor) {
                         const glm::vec4 c = floorColor + idx * (ceilColor - floorColor);
-                        _slicedData.push_back(c.r);
-                        _slicedData.push_back(c.g);
-                        _slicedData.push_back(c.b);
-                        _slicedData.push_back(c.a);
+                        result.push_back(c.r);
+                        result.push_back(c.g);
+                        result.push_back(c.b);
+                        result.push_back(c.a);
                     }
                     else {
-                        _slicedData.push_back(floorColor.r);
-                        _slicedData.push_back(floorColor.g);
-                        _slicedData.push_back(floorColor.b);
-                        _slicedData.push_back(floorColor.a);
+                        result.push_back(floorColor.r);
+                        result.push_back(floorColor.g);
+                        result.push_back(floorColor.b);
+                        result.push_back(floorColor.a);
                     }
                 }
                 else {
-                    float ncmap = static_cast<float>(_colorMapData.size());
+                    float ncmap = static_cast<float>(_colorMap.entries.size());
                     float normalization = ((cmax != cmin) && (ncmap > 2)) ?
                         (ncmap - 2) / (cmax - cmin) : 0;
                     int colorIndex = (variableColor - cmin) * normalization + 1;
@@ -1576,25 +1104,30 @@ void RenderableBillboardsCloud::createDataSlice() {
                     colorIndex = colorIndex >= ncmap ? ncmap - 1 : colorIndex;
 
                     for (int j = 0; j < 4; ++j) {
-                        _slicedData.push_back(_colorMapData[colorIndex][j]);
+                        result.push_back(_colorMap.entries[colorIndex][j]);
                     }
                 }
             }
 
             if (_hasDatavarSize) {
-                addDatavarSizeScalling(i, sizeScalingInUse);
+                result.push_back(e.data[sizeScalingInUse]);
             }
         }
         else if (_hasDatavarSize) {
-            addDatavarSizeScalling(i, sizeScalingInUse);
-            addPosition(position);
+            result.push_back(e.data[sizeScalingInUse]);
+            for (int j = 0; j < 4; ++j) {
+                result.push_back(position[j]);
+            }
         }
         else {
-            addPosition(position);
+            for (int j = 0; j < 4; ++j) {
+                result.push_back(position[j]);
+            }
         }
     }
     setBoundingSphere(maxRadius);
-    _fadeInDistance.setMaxValue(glm::vec2(10.f * biggestCoord));
+    _fadeInDistances.setMaxValue(glm::vec2(10.f * biggestCoord));
+    return result;
 }
 
 void RenderableBillboardsCloud::createPolygonTexture() {
@@ -1654,20 +1187,13 @@ void RenderableBillboardsCloud::loadPolygonGeometryForRendering() {
     glBindVertexArray(_polygonVao);
     glBindBuffer(GL_ARRAY_BUFFER, _polygonVbo);
 
-    const GLfloat vertex_data[] = {
+    constexpr const std::array<GLfloat, 4> VertexData = {
         //      x      y     z     w
         0.f, 0.f, 0.f, 1.f,
     };
 
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), vertex_data, GL_STATIC_DRAW);
-    glVertexAttribPointer(
-        0,
-        4,
-        GL_FLOAT,
-        GL_FALSE,
-        sizeof(GLfloat) * 4,
-        nullptr
-    );
+    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData.data(), GL_STATIC_DRAW);
+    glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr);
     glEnableVertexAttribArray(0);
     glBindVertexArray(0);
 }
@@ -1682,8 +1208,8 @@ void RenderableBillboardsCloud::renderPolygonGeometry(GLuint vao) {
         );
 
     program->activate();
-    static const float black[] = { 0.f, 0.f, 0.f, 0.f };
-    glClearBufferfv(GL_COLOR, 0, black);
+    constexpr const glm::vec4 Black = glm::vec4(0.f, 0.f, 0.f, 0.f);
+    glClearBufferfv(GL_COLOR, 0, glm::value_ptr(Black));
 
     program->setUniform("sides", _polygonSides);
     program->setUniform("polygonColor", _pointColor);
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.h b/modules/digitaluniverse/rendering/renderablebillboardscloud.h
index 4f8d9a45f0..abc3d5d30f 100644
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.h
+++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.h
@@ -27,11 +27,13 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <modules/space/speckloader.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/triggerproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/vector/ivec2property.h>
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <ghoul/opengl/ghoul_gl.h>
@@ -78,7 +80,7 @@ private:
     };
     double unitToMeter(Unit unit) const;
 
-    void createDataSlice();
+    std::vector<float> createDataSlice();
     void createPolygonTexture();
     void renderToTexture(GLuint textureToRenderTo, GLuint textureWidth,
         GLuint textureHeight);
@@ -89,15 +91,6 @@ private:
     void renderLabels(const RenderData& data, const glm::dmat4& modelViewProjectionMatrix,
         const glm::dvec3& orthoRight, const glm::dvec3& orthoUp, float fadeInVariable);
 
-    bool loadData();
-    bool loadSpeckData();
-    bool loadLabelData();
-    bool readSpeckFile();
-    bool readColorMapFile();
-    bool readLabelFile();
-    bool loadCachedFile(const std::string& file);
-    bool saveCachedFile(const std::string& file) const;
-
     bool _hasSpeckFile = false;
     bool _dataIsDirty = true;
     bool _textColorIsDirty = true;
@@ -119,24 +112,20 @@ private:
     properties::Vec3Property _textColor;
     properties::FloatProperty _textOpacity;
     properties::FloatProperty _textSize;
-    properties::FloatProperty _textMinSize;
-    properties::FloatProperty _textMaxSize;
+    properties::IVec2Property _textMinMaxSize;
     properties::BoolProperty _drawElements;
     properties::BoolProperty _drawLabels;
     properties::BoolProperty _pixelSizeControl;
     properties::OptionProperty _colorOption;
     properties::Vec2Property _optionColorRangeData;
     properties::OptionProperty _datavarSizeOption;
-    properties::Vec2Property _fadeInDistance;
+    properties::Vec2Property _fadeInDistances;
     properties::BoolProperty _disableFadeInDistance;
-    properties::FloatProperty _billboardMaxSize;
-    properties::FloatProperty _billboardMinSize;
+    properties::Vec2Property _billboardMinMaxSize;
     properties::FloatProperty _correctionSizeEndDistance;
     properties::FloatProperty _correctionSizeFactor;
     properties::BoolProperty _useLinearFiltering;
     properties::TriggerProperty _setRangeFromData;
-
-    // DEBUG:
     properties::OptionProperty _renderOption;
 
     ghoul::opengl::Texture* _polygonTexture = nullptr;
@@ -144,8 +133,9 @@ private:
     ghoul::opengl::ProgramObject* _program = nullptr;
     ghoul::opengl::ProgramObject* _renderToPolygonProgram = nullptr;
 
-    UniformCache(cameraViewProjectionMatrix, modelMatrix, cameraPos, cameraLookup,
-        renderOption, minBillboardSize, maxBillboardSize, correctionSizeEndDistance,
+    UniformCache(
+        cameraViewProjectionMatrix, modelMatrix, cameraPos, cameraLookup, renderOption,
+        minBillboardSize, maxBillboardSize, correctionSizeEndDistance,
         correctionSizeFactor, color, alphaValue, scaleFactor, up, right, fadeInValue,
         screenSize, spriteTexture, hasColormap, enabledRectSizeControl, hasDvarScaling
     ) _uniformCache;
@@ -160,17 +150,14 @@ private:
 
     Unit _unit = Parsec;
 
-    std::vector<float> _slicedData;
-    std::vector<float> _fullData;
-    std::vector<glm::vec4> _colorMapData;
+    speck::Dataset _dataset;
+    speck::Labelset _labelset;
+    speck::ColorMap _colorMap;
+
     std::vector<glm::vec2> _colorRangeData;
-    std::vector<std::pair<glm::vec3, std::string>> _labelData;
-    std::unordered_map<std::string, int> _variableDataPositionMap;
     std::unordered_map<int, std::string> _optionConversionMap;
     std::unordered_map<int, std::string> _optionConversionSizeMap;
 
-    int _nValuesPerAstronomicalObject = 0;
-
     glm::dmat4 _transformationMatrix = glm::dmat4(1.0);
 
     GLuint _vao = 0;
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index d73465cc19..b7e0a708df 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -44,6 +44,7 @@
 #include <ghoul/opengl/textureunit.h>
 #include <array>
 #include <cstdint>
+#include <filesystem>
 #include <fstream>
 #include <optional>
 
@@ -58,7 +59,6 @@ namespace {
     constexpr const int RenderOptionViewDirection = 0;
     constexpr const int RenderOptionPositionNormal = 1;
 
-    constexpr const int8_t CurrentCacheVersion = 1;
     constexpr const double PARSEC = 0.308567756E17;
 
     constexpr openspace::properties::Property::PropertyInfo TextColorInfo = {
@@ -87,18 +87,11 @@ namespace {
         "objects being rendered."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelMinSizeInfo = {
-        "TextMinSize",
-        "Text Min Size",
-        "The minimal size (in pixels) of the text for the labels for the astronomical "
-        "objects being rendered."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo LabelMaxSizeInfo = {
-        "TextMaxSize",
-        "Text Max Size",
-        "The maximum size (in pixels) of the text for the labels for the astronomical "
-        "objects being rendered."
+    constexpr openspace::properties::Property::PropertyInfo LabelMinMaxSizeInfo = {
+        "TextMinMaxSize",
+        "Text Min/Max Size",
+        "The minimum and maximum size (in pixels) of the text for the labels for the "
+        "astronomical objects being rendered."
     };
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
@@ -162,11 +155,8 @@ namespace {
         // [[codegen::verbatim(LabelFileInfo.description)]]
         std::optional<std::string> labelFile;
 
-        // [[codegen::verbatim(LabelMinSizeInfo.description)]]
-        std::optional<float> textMinSize;
-
-        // [[codegen::verbatim(LabelMaxSizeInfo.description)]]
-        std::optional<float> textMaxSize;
+        // [[codegen::verbatim(LabelMinMaxSizeInfo.description)]]
+        std::optional<glm::ivec2> textMinMaxSize;
 
         // [[codegen::verbatim(LineWidthInfo.description)]]
         std::optional<float> lineWidth;
@@ -180,9 +170,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableDUMeshes::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "digitaluniverse_renderabledumeshes";
-    return doc;
+    return codegen::doc<Parameters>("digitaluniverse_renderabledumeshes");
 }
 
 RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
@@ -192,8 +180,12 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
     , _textSize(TextSizeInfo, 8.f, 0.5f, 24.f)
     , _drawElements(DrawElementsInfo, true)
     , _drawLabels(DrawLabelInfo, false)
-    , _textMinSize(LabelMinSizeInfo, 8.f, 0.5f, 24.f)
-    , _textMaxSize(LabelMaxSizeInfo, 500.f, 0.f, 1000.f)
+    , _textMinMaxSize(
+        LabelMinMaxSizeInfo,
+        glm::ivec2(8, 500),
+        glm::ivec2(0),
+        glm::ivec2(1000)
+    )
     , _lineWidth(LineWidthInfo, 2.f, 1.f, 16.f)
     , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
 {
@@ -202,7 +194,7 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    _speckFile = absPath(p.file);
+    _speckFile = absPath(p.file).string();
     _hasSpeckFile = true;
     _drawElements.onChange([&]() { _hasSpeckFile = !_hasSpeckFile; });
     addProperty(_drawElements);
@@ -252,13 +244,13 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
     _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
 
-    _drawLabels = p.drawLabels.value_or(_drawLabels);
-    addProperty(_drawLabels);
-
     if (p.labelFile.has_value()) {
-        _labelFile = absPath(*p.labelFile);
+        _labelFile = absPath(*p.labelFile).string();
         _hasLabel = true;
 
+        _drawLabels = p.drawLabels.value_or(_drawLabels);
+        addProperty(_drawLabels);
+
         _textColor = p.textColor.value_or(_textColor);
         _hasLabel = p.textColor.has_value();
         _textColor.setViewOption(properties::Property::ViewOptions::Color);
@@ -271,11 +263,9 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
         _textSize = p.textSize.value_or(_textSize);
         addProperty(_textSize);
 
-        _textMinSize = p.textMinSize.value_or(_textMinSize);
-        addProperty(_textMinSize);
-
-        _textMaxSize = p.textMaxSize.value_or(_textMaxSize);
-        addProperty(_textMaxSize);
+        _textMinMaxSize = p.textMinMaxSize.value_or(_textMinMaxSize);
+        _textMinMaxSize.setViewOption(properties::Property::ViewOptions::MinMaxRange);
+        addProperty(_textMinMaxSize);
     }
 
     if (p.meshColor.has_value()) {
@@ -288,7 +278,7 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
 
 bool RenderableDUMeshes::isReady() const {
     return (_program != nullptr) &&
-        (!_renderingMeshesMap.empty() || (!_labelData.empty()));
+        (!_renderingMeshesMap.empty() || (!_labelset.entries.empty()));
 }
 
 void RenderableDUMeshes::initializeGL() {
@@ -419,8 +409,8 @@ void RenderableDUMeshes::renderLabels(const RenderData& data,
     ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo;
     labelInfo.orthoRight = orthoRight;
     labelInfo.orthoUp = orthoUp;
-    labelInfo.minSize = static_cast<int>(_textMinSize);
-    labelInfo.maxSize = static_cast<int>(_textMaxSize);
+    labelInfo.minSize = _textMinMaxSize.value().x;
+    labelInfo.maxSize = _textMinMaxSize.value().y;
     labelInfo.cameraPos = data.camera.positionVec3();
     labelInfo.cameraLookUp = data.camera.lookUpVectorWorldSpace();
     labelInfo.renderType = _renderOption;
@@ -431,13 +421,13 @@ void RenderableDUMeshes::renderLabels(const RenderData& data,
 
     glm::vec4 textColor = glm::vec4(glm::vec3(_textColor), _textOpacity);
 
-    for (const std::pair<glm::vec3, std::string>& pair : _labelData) {
-        glm::vec3 scaledPos(pair.first);
+    for (const speck::Labelset::Entry& e : _labelset.entries) {
+        glm::vec3 scaledPos(e.position);
         scaledPos *= scale;
         ghoul::fontrendering::FontRenderer::defaultProjectionRenderer().render(
             *_font,
             scaledPos,
-            pair.second,
+            e.text,
             textColor,
             labelInfo
         );
@@ -494,31 +484,7 @@ void RenderableDUMeshes::update(const UpdateData&) {
 bool RenderableDUMeshes::loadData() {
     bool success = false;
     if (_hasSpeckFile) {
-        // I disabled the cache as it didn't work on Mac --- abock
-        // std::string cachedFile = FileSys.cacheManager()->cachedFilename(
-        //     _speckFile,
-        //     ghoul::filesystem::CacheManager::Persistent::Yes
-        // );
-
-        // bool hasCachedFile = FileSys.fileExists(cachedFile);
-        // if (hasCachedFile) {
-        //     LINFO(
-        //         "Cached file '" << cachedFile <<
-        //         "' used for Speck file '" << _speckFile << "'"
-        //     );
-
-        //     success = loadCachedFile(cachedFile);
-        //     if (!success) {
-        //         FileSys.cacheManager()->removeCacheFile(_speckFile);
-        //         // Intentional fall-through to the 'else' to generate the cache
-        //         // file for the next run
-        //     }
-        // }
-        // else
-        // {
-        //     LINFO("Cache for Speck file '" << _speckFile << "' not found");
         LINFO(fmt::format("Loading Speck file '{}'", _speckFile));
-
         success = readSpeckFile();
         if (!success) {
             return false;
@@ -527,35 +493,7 @@ bool RenderableDUMeshes::loadData() {
 
     std::string labelFile = _labelFile;
     if (!labelFile.empty()) {
-        // I disabled the cache as it didn't work on Mac --- abock
-        // std::string cachedFile = FileSys.cacheManager()->cachedFilename(
-        //     labelFile,
-        //     ghoul::filesystem::CacheManager::Persistent::Yes
-        // );
-        // bool hasCachedFile = FileSys.fileExists(cachedFile);
-        // if (hasCachedFile) {
-        //     LINFO(
-        //         "Cached file '" << cachedFile << "' used for Label file '" <<
-        //         labelFile << "'"
-        //     );
-
-        //     success &= loadCachedFile(cachedFile);
-        //     if (!success) {
-        //         FileSys.cacheManager()->removeCacheFile(labelFile);
-        //         // Intentional fall-through to the 'else' to generate the cache
-        //         // file for the next run
-        //     }
-        // }
-        // else {
-        //     LINFO("Cache for Label file '" << labelFile << "' not found");
-        LINFO(fmt::format("Loading Label file '{}'", labelFile));
-
-        success &= readLabelFile();
-        if (!success) {
-            return false;
-        }
-
-        // }
+        _labelset = speck::label::loadFileWithCache(_labelFile);
     }
 
     return success;
@@ -688,158 +626,6 @@ bool RenderableDUMeshes::readSpeckFile() {
     return true;
 }
 
-bool RenderableDUMeshes::readLabelFile() {
-    std::ifstream file(_labelFile);
-    if (!file.good()) {
-        LERROR(fmt::format("Failed to open Label file '{}'", _labelFile));
-        return false;
-    }
-
-    // The beginning of the speck file has a header that either contains comments
-    // (signaled by a preceding '#') or information about the structure of the file
-    // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
-    std::string line;
-    while (true) {
-        std::streampos position = file.tellg();
-        std::getline(file, line);
-
-        // Guard against wrong line endings (copying files from Windows to Mac) causes
-        // lines to have a final \r
-        if (!line.empty() && line.back() == '\r') {
-            line = line.substr(0, line.length() - 1);
-        }
-
-
-        if (line.empty() || line[0] == '#') {
-            continue;
-        }
-
-        if (line.substr(0, 9) != "textcolor") {
-            // we read a line that doesn't belong to the header, so we have to jump back
-            // before the beginning of the current line
-            file.seekg(position);
-            continue;
-        }
-
-        if (line.substr(0, 9) == "textcolor") {
-            // textcolor lines are structured as follows:
-            // textcolor # description
-            // where # is color text defined in configuration file
-            std::stringstream str(line);
-
-            // TODO: handle cases of labels with different colors
-            break;
-        }
-    }
-
-    do {
-        std::vector<float> values(_nValuesPerAstronomicalObject);
-
-        std::getline(file, line);
-
-        // Guard against wrong line endings (copying files from Windows to Mac) causes
-        // lines to have a final \r
-        if (!line.empty() && line.back() == '\r') {
-            line = line.substr(0, line.length() - 1);
-        }
-
-        if (line.empty()) {
-            continue;
-        }
-
-        std::stringstream str(line);
-
-        glm::vec3 position = glm::vec3(0.f);
-        for (int j = 0; j < 3; ++j) {
-            str >> position[j];
-        }
-
-        std::string dummy;
-        str >> dummy; // text keyword
-
-        std::string label;
-        str >> label;
-        dummy.clear();
-
-        while (str >> dummy) {
-            label += " " + dummy;
-            dummy.clear();
-        }
-
-        _labelData.emplace_back(std::make_pair(position, label));
-
-    } while (!file.eof());
-
-    return true;
-}
-
-bool RenderableDUMeshes::loadCachedFile(const std::string& file) {
-    std::ifstream fileStream(file, std::ifstream::binary);
-    if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
-        return false;
-    }
-
-    int8_t version = 0;
-    fileStream.read(reinterpret_cast<char*>(&version), sizeof(int8_t));
-    if (version != CurrentCacheVersion) {
-        LINFO("The format of the cached file has changed: deleting old cache");
-        fileStream.close();
-        FileSys.deleteFile(file);
-        return false;
-    }
-
-    int32_t nValues = 0;
-    fileStream.read(reinterpret_cast<char*>(&nValues), sizeof(int32_t));
-    fileStream.read(
-        reinterpret_cast<char*>(&_nValuesPerAstronomicalObject),
-        sizeof(int32_t)
-    );
-
-    _fullData.resize(nValues);
-    fileStream.read(
-        reinterpret_cast<char*>(&_fullData[0]),
-        nValues * sizeof(_fullData[0])
-    );
-
-    bool success = fileStream.good();
-    return success;
-}
-
-bool RenderableDUMeshes::saveCachedFile(const std::string& file) const {
-    std::ofstream fileStream(file, std::ofstream::binary);
-    if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file '{}' for save cache file", file));
-        return false;
-    }
-
-    fileStream.write(
-        reinterpret_cast<const char*>(&CurrentCacheVersion),
-        sizeof(int8_t)
-    );
-
-    const int32_t nValues = static_cast<int32_t>(_fullData.size());
-    if (nValues == 0) {
-        LERROR("Error writing cache: No values were loaded");
-        return false;
-    }
-    fileStream.write(reinterpret_cast<const char*>(&nValues), sizeof(int32_t));
-
-    const int32_t nValuesPerAstronomicalObject = static_cast<int32_t>(
-        _nValuesPerAstronomicalObject
-    );
-    fileStream.write(
-        reinterpret_cast<const char*>(&nValuesPerAstronomicalObject),
-        sizeof(int32_t)
-    );
-
-    const size_t nBytes = nValues * sizeof(_fullData[0]);
-    fileStream.write(reinterpret_cast<const char*>(&_fullData[0]), nBytes);
-
-    const bool success = fileStream.good();
-    return success;
-}
-
 void RenderableDUMeshes::createMeshes() {
     if (!(_dataIsDirty && _hasSpeckFile)) {
         return;
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.h b/modules/digitaluniverse/rendering/renderabledumeshes.h
index 04d32ae50f..b397eb3a14 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.h
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.h
@@ -27,10 +27,12 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <modules/space/speckloader.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/vector/ivec2property.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/uniformcache.h>
@@ -108,9 +110,6 @@ private:
 
     bool loadData();
     bool readSpeckFile();
-    bool readLabelFile();
-    bool loadCachedFile(const std::string& file);
-    bool saveCachedFile(const std::string& file) const;
 
     bool _hasSpeckFile = false;
     bool _dataIsDirty = true;
@@ -122,8 +121,7 @@ private:
     properties::FloatProperty _textSize;
     properties::BoolProperty _drawElements;
     properties::BoolProperty _drawLabels;
-    properties::FloatProperty _textMinSize;
-    properties::FloatProperty _textMaxSize;
+    properties::IVec2Property _textMinMaxSize;
     properties::FloatProperty _lineWidth;
 
     // DEBUG:
@@ -140,8 +138,7 @@ private:
     Unit _unit = Parsec;
 
     std::vector<float> _fullData;
-    std::vector<std::pair<glm::vec3, std::string>> _labelData;
-    int _nValuesPerAstronomicalObject = 0;
+    speck::Labelset _labelset;
 
     std::unordered_map<int, glm::vec3> _meshColorMap;
     std::unordered_map<int, RenderingMesh> _renderingMeshesMap;
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index 7d754f9308..1e54b6a7c7 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -30,6 +30,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/updatestructures.h>
+#include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
@@ -41,6 +42,7 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <array>
+#include <filesystem>
 #include <fstream>
 #include <optional>
 #include <string>
@@ -49,11 +51,12 @@ namespace {
     constexpr const char* _loggerCat = "RenderablePlanesCloud";
     constexpr const char* ProgramObjectName = "RenderablePlanesCloud";
 
+    constexpr const int PlanesVertexDataSize = 36;
+
     constexpr std::array<const char*, 4> UniformNames = {
         "modelViewProjectionTransform", "alphaValue", "fadeInValue", "galaxyTexture"
     };
 
-    constexpr int8_t CurrentCacheVersion = 2;
     constexpr double PARSEC = 0.308567756E17;
 
     enum BlendMode {
@@ -243,9 +246,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderablePlanesCloud::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "digitaluniverse_RenderablePlanesCloud";
-    return doc;
+    return codegen::doc<Parameters>("digitaluniverse_RenderablePlanesCloud");
 }
 
 RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary)
@@ -256,7 +257,7 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
     , _textSize(TextSizeInfo, 8.0, 0.5, 24.0)
     , _drawElements(DrawElementsInfo, true)
     , _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _fadeInDistance(
+    , _fadeInDistances(
         FadeInDistancesInfo,
         glm::vec2(0.f),
         glm::vec2(0.f),
@@ -271,7 +272,7 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
     addProperty(_opacity);
 
     if (p.file.has_value()) {
-        _speckFile = absPath(*p.file);
+        _speckFile = absPath(*p.file).string();
         _hasSpeckFile = true;
         _drawElements.onChange([&]() { _hasSpeckFile = !_hasSpeckFile; });
         addProperty(_drawElements);
@@ -319,7 +320,7 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
     _scaleFactor.onChange([&]() { _dataIsDirty = true; });
 
     if (p.labelFile.has_value()) {
-        _labelFile = absPath(*p.labelFile);
+        _labelFile = absPath(*p.labelFile).string();
         _hasLabel = true;
 
         _textColor = p.textColor.value_or(_textColor);
@@ -367,16 +368,16 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
         }
     }
 
-    _texturesPath = absPath(p.texturePath);
+    _texturesPath = absPath(p.texturePath).string();
 
     _luminosityVar = p.luminosity.value_or(_luminosityVar);
     _sluminosity = p.scaleLuminosity.value_or(_sluminosity);
 
-
     if (p.fadeInDistances.has_value()) {
-        _fadeInDistance = *p.fadeInDistances;
+        _fadeInDistances = *p.fadeInDistances;
         _disableFadeInDistance = false;
-        addProperty(_fadeInDistance);
+        _fadeInDistances.setViewOption(properties::Property::ViewOptions::MinMaxRange);
+        addProperty(_fadeInDistances);
         addProperty(_disableFadeInDistance);
     }
 
@@ -388,15 +389,25 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
 }
 
 bool RenderablePlanesCloud::isReady() const {
-    return ((_program != nullptr) && (!_fullData.empty())) || (!_labelData.empty());
+    return (_program && (!_dataset.entries.empty())) || (!_labelset.entries.empty());
 }
 
 void RenderablePlanesCloud::initialize() {
     ZoneScoped
 
-    const bool success = loadData();
-    if (!success) {
-        throw ghoul::RuntimeError("Error loading data");
+    if (_hasSpeckFile && std::filesystem::is_regular_file(_speckFile)) {
+        _dataset = speck::data::loadFileWithCache(_speckFile);
+        if (_dataset.entries.empty()) {
+            throw ghoul::RuntimeError("Error loading data");
+        }
+    }
+
+    if (!_labelFile.empty()) {
+        LINFO(fmt::format("Loading Label file '{}'", _labelFile));
+        _labelset = speck::label::loadFileWithCache(_labelFile);
+        for (speck::Labelset::Entry& e : _labelset.entries) {
+            e.position = glm::vec3(_transformationMatrix * glm::dvec4(e.position, 1.0));
+        }
     }
 }
 
@@ -417,7 +428,6 @@ void RenderablePlanesCloud::initializeGL() {
     ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
 
     createPlanes();
-
     loadTextures();
 
     if (_hasLabel) {
@@ -433,7 +443,6 @@ void RenderablePlanesCloud::initializeGL() {
     }
 }
 
-
 void RenderablePlanesCloud::deleteDataGPUAndCPU() {
     for (std::unordered_map<int, PlaneAggregate>::reference pAMapItem : _planesMap) {
         glDeleteBuffers(1, &pAMapItem.second.vbo);
@@ -484,8 +493,7 @@ void RenderablePlanesCloud::renderPlanes(const RenderData&,
     _program->setUniform(_uniformCache.galaxyTexture, unit);
     int currentTextureIndex = -1;
 
-    for (std::unordered_map<int, PlaneAggregate>::reference pAMapItem : _planesMap)
-    {
+    for (std::unordered_map<int, PlaneAggregate>::reference pAMapItem : _planesMap) {
         // For planes with undefined textures references
         if (pAMapItem.first == 30) {
             continue;
@@ -514,35 +522,8 @@ void RenderablePlanesCloud::renderLabels(const RenderData& data,
                                          const glm::dvec3& orthoRight,
                                          const glm::dvec3& orthoUp, float fadeInVariable)
 {
-    float scale = 0.f;
-    switch (_unit) {
-        case Meter:
-            scale = 1.f;
-            break;
-        case Kilometer:
-            scale = 1e3f;
-            break;
-        case Parsec:
-            scale = static_cast<float>(PARSEC);
-            break;
-        case Kiloparsec:
-            scale = static_cast<float>(1e3 * PARSEC);
-            break;
-        case Megaparsec:
-            scale = static_cast<float>(1e6 * PARSEC);
-            break;
-        case Gigaparsec:
-            scale = static_cast<float>(1e9 * PARSEC);
-            break;
-        case GigalightYears:
-            scale = static_cast<float>(306391534.73091 * PARSEC);
-            break;
-    }
-
-    glm::vec4 textColor = glm::vec4(
-        glm::vec3(_textColor),
-        _textOpacity * fadeInVariable
-    );
+    double scale = unitToMeter(_unit);
+    glm::vec4 textColor = glm::vec4(glm::vec3(_textColor), _textOpacity * fadeInVariable);
 
     ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo;
     labelInfo.orthoRight = orthoRight;
@@ -557,14 +538,12 @@ void RenderablePlanesCloud::renderLabels(const RenderData& data,
     labelInfo.enableDepth = true;
     labelInfo.enableFalseDepth = false;
 
-    for (const std::pair<glm::vec3, std::string>& pair : _labelData) {
-        //glm::vec3 scaledPos(_transformationMatrix * glm::dvec4(pair.first, 1.0));
-        glm::vec3 scaledPos(pair.first);
-        scaledPos *= scale;
+    for (const speck::Labelset::Entry& e : _labelset.entries) {
+        glm::dvec3 scaledPos = glm::dvec3(e.position) * scale;
         ghoul::fontrendering::FontRenderer::defaultProjectionRenderer().render(
             *_font,
             scaledPos,
-            pair.second,
+            e.text,
             textColor,
             labelInfo
         );
@@ -578,7 +557,7 @@ void RenderablePlanesCloud::render(const RenderData& data, RendererTasks&) {
     if (!_disableFadeInDistance) {
         float distCamera = static_cast<float>(glm::length(data.camera.positionVec3()));
         distCamera = static_cast<float>(distCamera / scale);
-        const glm::vec2 fadeRange = _fadeInDistance;
+        const glm::vec2 fadeRange = _fadeInDistances;
         //const float a = 1.f / ((fadeRange.y - fadeRange.x) * scale);
         const float a = 1.f / ((fadeRange.y - fadeRange.x));
         const float b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
@@ -597,8 +576,7 @@ void RenderablePlanesCloud::render(const RenderData& data, RendererTasks&) {
 
     const glm::dmat4 modelViewMatrix = data.camera.combinedViewMatrix() * modelMatrix;
     const glm::mat4 projectionMatrix = data.camera.projectionMatrix();
-    const glm::dmat4 modelViewProjectionMatrix = glm::dmat4(projectionMatrix) *
-                                                 modelViewMatrix;
+    const glm::dmat4 mvpMatrix = glm::dmat4(projectionMatrix) * modelViewMatrix;
 
     const glm::dmat4 invMVPParts = glm::inverse(modelMatrix) *
                                    glm::inverse(data.camera.combinedViewMatrix()) *
@@ -615,13 +593,7 @@ void RenderablePlanesCloud::render(const RenderData& data, RendererTasks&) {
     }
 
     if (_hasLabel) {
-        renderLabels(
-            data,
-            modelViewProjectionMatrix,
-            orthoRight,
-            orthoUp,
-            fadeInVariable
-        );
+        renderLabels(data, mvpMatrix, orthoRight, orthoUp, fadeInVariable);
     }
 }
 
@@ -638,442 +610,48 @@ void RenderablePlanesCloud::update(const UpdateData&) {
     }
 }
 
-bool RenderablePlanesCloud::loadData() {
-    bool success = false;
-    if (_hasSpeckFile) {
-        // I disabled the cache as it didn't work on Mac --- abock
-        // std::string cachedFile = FileSys.cacheManager()->cachedFilename(
-        //     _speckFile,
-        //     ghoul::filesystem::CacheManager::Persistent::Yes
-        // );
+void RenderablePlanesCloud::loadTextures() {
+    for (const speck::Dataset::Texture& tex : _dataset.textures) {
+        std::filesystem::path fullPath = absPath(_texturesPath + '/' + tex.file);
+        std::filesystem::path pngPath = fullPath;
+        pngPath.replace_extension(".png");
 
-        // bool hasCachedFile = FileSys.fileExists(cachedFile);
-        // if (hasCachedFile) {
-        //     LINFO(
-        //         "Cached file '" << cachedFile <<
-        //         "' used for Speck file '" << _speckFile << "'"
-        //     );
-
-        //     success = loadCachedFile(cachedFile);
-        //     if (!success) {
-        //         FileSys.cacheManager()->removeCacheFile(_speckFile);
-        //         // Intentional fall-through to the 'else' to generate the cache
-        //         // file for the next run
-        //     }
-        // }
-        // else
-        // {
-        //     LINFO("Cache for Speck file '" << _speckFile << "' not found");
-        LINFO(fmt::format("Loading Speck file '{}'", _speckFile));
-
-            success = readSpeckFile();
-            if (!success) {
-                return false;
-            }
-
-            // LINFO("Saving cache");
-            //success &= saveCachedFile(cachedFile);
-        // }
-    }
-
-    if (!_labelFile.empty()) {
-        // I disabled the cache as it didn't work on Mac --- abock
-        // std::string cachedFile = FileSys.cacheManager()->cachedFilename(
-        //     _labelFile,
-        //     ghoul::filesystem::CacheManager::Persistent::Yes
-        // );
-        // bool hasCachedFile = FileSys.fileExists(cachedFile);
-        // if (hasCachedFile) {
-        //     LINFO(
-        //         "Cached file '" << cachedFile <<
-        //         "' used for Label file '" << _labelFile << "'"
-        //     );
-        //
-        //     success &= loadCachedFile(cachedFile);
-        //     if (!success) {
-        //         FileSys.cacheManager()->removeCacheFile(_labelFile);
-        //         // Intentional fall-through to the 'else' to generate the cache
-        //         // file for the next run
-        //     }
-        // }
-        // else
-        // {
-        //     LINFO("Cache for Label file '" << _labelFile << "' not found");
-            LINFO(fmt::format("Loading Label file '{}'", _labelFile));
-
-            success &= readLabelFile();
-            if (!success) {
-                return false;
-            }
-
-        // }
-    }
-
-    return success;
-}
-
-bool RenderablePlanesCloud::loadTextures() {
-    if (!_textureFileMap.empty()) {
-        for (const std::pair<const int, std::string>& pair : _textureFileMap) {
-            const auto& p = _textureMap.insert(std::make_pair(
-                pair.first,
-                ghoul::io::TextureReader::ref().loadTexture(pair.second)
+        std::filesystem::path path;
+        if (std::filesystem::is_regular_file(fullPath)) {
+            path = fullPath;
+        }
+        else if (std::filesystem::is_regular_file(pngPath)) {
+            path = pngPath;
+        }
+        else {
+            // We can't really recover from this as it would crash during rendering anyway
+            throw ghoul::RuntimeError(fmt::format(
+                "Could not find image file '{}'", tex.file
             ));
-            if (p.second) {
-                LINFOC(
-                    "RenderablePlanesCloud",
-                    fmt::format("Loaded texture from '{}'", pair.second)
-                );
-                p.first->second->uploadTexture();
-                p.first->second->setFilter(
-                    ghoul::opengl::Texture::FilterMode::LinearMipMap
-                );
-                p.first->second->purgeFromRAM();
-            }
-        }
-    }
-    else {
-        return false;
-    }
-    return true;
-}
-
-bool RenderablePlanesCloud::readSpeckFile() {
-    std::ifstream file(_speckFile);
-    if (!file.good()) {
-        LERROR(fmt::format("Failed to open Speck file '{}'", _speckFile));
-        return false;
-    }
-
-    _nValuesPerAstronomicalObject = 0;
-
-    // The beginning of the speck file has a header that either contains comments
-    // (signaled by a preceding '#') or information about the structure of the file
-    // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
-    std::string line;
-    while (true) {
-        std::getline(file, line);
-
-        // Guard against wrong line endings (copying files from Windows to Mac) causes
-        // lines to have a final \r
-        if (!line.empty() && line.back() == '\r') {
-            line = line.substr(0, line.length() -1);
         }
 
-        if (line.empty() || line[0] == '#') {
-            continue;
+        std::unique_ptr<ghoul::opengl::Texture> t =
+            ghoul::io::TextureReader::ref().loadTexture(path.string());
+
+        if (t) {
+            LINFOC("RenderablePlanesCloud", fmt::format("Loaded texture '{}'", path));
+            t->uploadTexture();
+            t->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
+            t->purgeFromRAM();
+        }
+        else {
+            // Same here, we won't be able to recover from this nullptr
+            throw ghoul::RuntimeError(fmt::format(
+                "Could not find image file '{}'", tex.file
+            ));
         }
 
-        if (line.substr(0, 7) != "datavar" &&
-            line.substr(0, 10) != "texturevar" &&
-            line.substr(0, 7) != "texture" &&
-            line.substr(0, 10) != "polyorivar" &&
-            line.substr(0, 10) != "maxcomment")
-        {
-            // Started reading data
-            break;
-        }
-
-        if (line.substr(0, 7) == "datavar") {
-            // datavar lines are structured as follows:
-            // datavar # description
-            // where # is the index of the data variable; so if we repeatedly overwrite
-            // the 'nValues' variable with the latest index, we will end up with the total
-            // number of values (+3 since X Y Z are not counted in the Speck file index)
-            std::stringstream str(line);
-
-            std::string dummy;
-            str >> dummy; // command
-            str >> _nValuesPerAstronomicalObject; // variable index
-            dummy.clear();
-            str >> dummy; // variable name
-
-            // +3 because of the x, y and z at the begining of each line.
-            _variableDataPositionMap.insert({ dummy, _nValuesPerAstronomicalObject + 3});
-
-            if ((dummy == "orientation") || (dummy == "ori")) { // 3d vectors u and v
-                // We want the number, but the index is 0 based
-                _nValuesPerAstronomicalObject += 6;
-            }
-            else {
-                // We want the number, but the index is 0 based
-                _nValuesPerAstronomicalObject += 1;
-            }
-        }
-
-        if (line.substr(0, 10) == "polyorivar") {
-            _planeStartingIndexPos = 0;
-            std::stringstream str(line);
-
-            std::string dummy;
-            str >> dummy; // command
-            str >> _planeStartingIndexPos;
-            _planeStartingIndexPos += 3; // 3 for xyz
-        }
-
-        if (line.substr(0, 10) == "texturevar") {
-            _textureVariableIndex = 0;
-            std::stringstream str(line);
-
-            std::string dummy;
-            str >> dummy; // command
-            str >> _textureVariableIndex;
-            _textureVariableIndex += 3; // 3 for xyz
-        }
-
-        if (line.substr(0, 8) == "texture ") {
-            std::stringstream str(line);
-
-            std::size_t found = line.find('-');
-
-            int textureIndex = 0;
-
-            std::string dummy;
-            str >> dummy; // command
-
-            if (found != std::string::npos) {
-                std::string option; // Not being used right now.
-                str >> option;
-            }
-
-            str >> textureIndex;
-            std::string fileName;
-            str >> fileName; // texture file name
-
-            std::string fullPath = absPath(_texturesPath + '/' + fileName);
-            std::string pngPath =
-                ghoul::filesystem::File(fullPath).fullBaseName() + ".png";
-
-            if (FileSys.fileExists(fullPath)) {
-                _textureFileMap.insert({ textureIndex, fullPath });
-
-            }
-            else if (FileSys.fileExists(pngPath)) {
-                _textureFileMap.insert({ textureIndex, pngPath });
-            }
-            else {
-                LWARNING(fmt::format("Could not find image file {}", fileName));
-                _textureFileMap.insert({ textureIndex, "" });
-            }
-        }
-    }
-
-    _nValuesPerAstronomicalObject += 3; // X Y Z are not counted in the Speck file indices
-
-    do {
-
-        // Guard against wrong line endings (copying files from Windows to Mac) causes
-        // lines to have a final \r
-        if (!line.empty() && line.back() == '\r') {
-            line = line.substr(0, line.length() -1);
-        }
-
-        if (line.empty()) {
-            std::getline(file, line);
-            continue;
-        }
-        else if (line[0] == '#') {
-            std::getline(file, line);
-            continue;
-        }
-
-        std::stringstream str(line);
-
-        glm::vec3 u(0.f);
-        glm::vec3 v(0.f);
-
-        std::vector<float> values(_nValuesPerAstronomicalObject);
-
-        for (int i = 0; i < _nValuesPerAstronomicalObject; ++i) {
-            str >> values[i];
-            if ((i >= _planeStartingIndexPos) &&
-                (i <= _planeStartingIndexPos + 6)) { // vectors u and v
-                int index = i - _planeStartingIndexPos;
-                switch (index) {
-                    case 0:
-                        u.x = values[i];
-                        break;
-                    case 1:
-                        u.y = values[i];
-                        break;
-                    case 2:
-                        u.z = values[i];
-                        break;
-                    case 3:
-                        v.x = values[i];
-                        break;
-                    case 4:
-                        v.y = values[i];
-                        break;
-                    case 5:
-                        v.z = values[i];
-                        break;
-                }
-            }
-        }
-        _fullData.insert(_fullData.end(), values.begin(), values.end());
-
-        // reads new line
-        std::getline(file, line);
-    } while (!file.eof());
-
-    return true;
-}
-
-bool RenderablePlanesCloud::readLabelFile() {
-    std::ifstream file(_labelFile);
-    if (!file.good()) {
-        LERROR(fmt::format("Failed to open Label file '{}'", _labelFile));
-        return false;
-    }
-
-    // The beginning of the speck file has a header that either contains comments
-    // (signaled by a preceding '#') or information about the structure of the file
-    // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
-    std::string line;
-    while (true) {
-        std::streampos position = file.tellg();
-        std::getline(file, line);
-
-        // Guard against wrong line endings (copying files from Windows to Mac) causes
-        // lines to have a final \r
-        if (!line.empty() && line.back() == '\r') {
-            line = line.substr(0, line.length() -1);
-        }
-
-        if (line.empty() || line[0] == '#') {
-            continue;
-        }
-
-        if (line.substr(0, 9) != "textcolor") {
-            // we read a line that doesn't belong to the header, so we have to jump back
-            // before the beginning of the current line
-            file.seekg(position);
-            continue;
-        }
-
-        if (line.substr(0, 9) == "textcolor") {
-            // textcolor lines are structured as follows:
-            // textcolor # description
-            // where # is color text defined in configuration file
-            std::stringstream str(line);
-
-            // TODO: handle cases of labels with different colors
-            break;
-        }
-    }
-
-    do {
-        std::vector<float> values(_nValuesPerAstronomicalObject);
-
-        std::getline(file, line);
-
-        // Guard against wrong line endings (copying files from Windows to Mac) causes
-        // lines to have a final \r
-        if (!line.empty() && line.back() == '\r') {
-            line = line.substr(0, line.length() -1);
-        }
-
-        if (line.empty()) {
-            continue;
-        }
-
-        std::stringstream str(line);
-
-        glm::vec3 position = glm::vec3(0.f);
-        for (int j = 0; j < 3; ++j) {
-            str >> position[j];
-        }
-
-        std::string dummy;
-        str >> dummy; // text keyword
-
-        std::string label;
-        str >> label;
-        dummy.clear();
-
-        while (str >> dummy) {
-            label += " " + dummy;
-            dummy.clear();
-        }
-
-        glm::vec3 transformedPos = glm::vec3(
-            _transformationMatrix * glm::dvec4(position, 1.0)
-        );
-        _labelData.emplace_back(std::make_pair(transformedPos, label));
-
-    } while (!file.eof());
-
-    return true;
-}
-
-bool RenderablePlanesCloud::loadCachedFile(const std::string& file) {
-    std::ifstream fileStream(file, std::ifstream::binary);
-    if (fileStream.good()) {
-        int8_t version = 0;
-        fileStream.read(reinterpret_cast<char*>(&version), sizeof(int8_t));
-        if (version != CurrentCacheVersion) {
-            LINFO("The format of the cached file has changed: deleting old cache");
-            fileStream.close();
-            FileSys.deleteFile(file);
-            return false;
-        }
-
-        int32_t nValues = 0;
-        fileStream.read(reinterpret_cast<char*>(&nValues), sizeof(int32_t));
-        fileStream.read(reinterpret_cast<char*>(
-            &_nValuesPerAstronomicalObject),
-            sizeof(int32_t)
-        );
-
-        _fullData.resize(nValues);
-        fileStream.read(reinterpret_cast<char*>(&_fullData[0]),
-            nValues * sizeof(_fullData[0]));
-
-        bool success = fileStream.good();
-        return success;
-    }
-    else {
-        LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
-        return false;
-    }
-}
-
-bool RenderablePlanesCloud::saveCachedFile(const std::string& file) const {
-    std::ofstream fileStream(file, std::ofstream::binary);
-    if (fileStream.good()) {
-        fileStream.write(reinterpret_cast<const char*>(&CurrentCacheVersion),
-            sizeof(int8_t));
-
-        const int32_t nValues = static_cast<int32_t>(_fullData.size());
-        if (nValues == 0) {
-            LERROR("Error writing cache: No values were loaded");
-            return false;
-        }
-        fileStream.write(reinterpret_cast<const char*>(&nValues), sizeof(int32_t));
-
-        const int32_t nValuesPerAstronomicalObject = static_cast<int32_t>(
-            _nValuesPerAstronomicalObject
-        );
-        fileStream.write(reinterpret_cast<const char*>(
-            &nValuesPerAstronomicalObject),
-            sizeof(int32_t)
-        );
-
-        const size_t nBytes = nValues * sizeof(_fullData[0]);
-        fileStream.write(reinterpret_cast<const char*>(&_fullData[0]), nBytes);
-
-        bool success = fileStream.good();
-        return success;
-    }
-    else {
-        LERROR(fmt::format("Error opening file '{}' for save cache file", file));
-        return false;
+        _textureMap.insert(std::pair(tex.index, std::move(t)));
     }
 }
 
 double RenderablePlanesCloud::unitToMeter(Unit unit) const {
-    switch (_unit) {
+    switch (unit) {
         case Meter:          return 1.0;
         case Kilometer:      return 1e3;
         case Parsec:         return PARSEC;
@@ -1087,29 +665,27 @@ double RenderablePlanesCloud::unitToMeter(Unit unit) const {
 
 void RenderablePlanesCloud::createPlanes() {
     if (_dataIsDirty && _hasSpeckFile) {
+        const int lumIdx = std::max(_dataset.index(_luminosityVar), 0);
         const double scale = unitToMeter(_unit);
 
         LDEBUG("Creating planes...");
         float maxSize = 0.f;
         double maxRadius = 0.0;
-        for (size_t p = 0; p < _fullData.size(); p += _nValuesPerAstronomicalObject) {
+        for (const speck::Dataset::Entry& e : _dataset.entries) {
             const glm::vec4 transformedPos = glm::vec4(
-                _transformationMatrix *
-                glm::dvec4(_fullData[p + 0], _fullData[p + 1], _fullData[p + 2], 1.0)
+                _transformationMatrix * glm::dvec4(e.position, 1.0)
             );
 
             const double r = glm::length(glm::dvec3(transformedPos) * scale);
-            if (r > maxRadius) {
-                maxRadius = r;
-            }
+            maxRadius = std::max(maxRadius, r);
 
             // Plane vectors u and v
             glm::vec4 u = glm::vec4(
                 _transformationMatrix *
                 glm::dvec4(
-                    _fullData[p + _planeStartingIndexPos + 0],
-                    _fullData[p + _planeStartingIndexPos + 1],
-                    _fullData[p + _planeStartingIndexPos + 2],
+                    e.data[_dataset.orientationDataIndex + 0],
+                    e.data[_dataset.orientationDataIndex + 1],
+                    e.data[_dataset.orientationDataIndex + 2],
                     1.f
                 )
             );
@@ -1119,9 +695,9 @@ void RenderablePlanesCloud::createPlanes() {
             glm::vec4 v = glm::vec4(
                 _transformationMatrix *
                 glm::dvec4(
-                    _fullData[p + _planeStartingIndexPos + 3],
-                    _fullData[p + _planeStartingIndexPos + 4],
-                    _fullData[p + _planeStartingIndexPos + 5],
+                    e.data[_dataset.orientationDataIndex + 3],
+                    e.data[_dataset.orientationDataIndex + 4],
+                    e.data[_dataset.orientationDataIndex + 5],
                     1.f
                 )
             );
@@ -1129,8 +705,7 @@ void RenderablePlanesCloud::createPlanes() {
             v.w = 0.f;
 
             if (!_luminosityVar.empty()) {
-                float lumS = _fullData[p + _variableDataPositionMap[_luminosityVar]] *
-                             _sluminosity;
+                float lumS = e.data[lumIdx] * _sluminosity;
                 u *= lumS;
                 v *= lumS;
             }
@@ -1150,12 +725,12 @@ void RenderablePlanesCloud::createPlanes() {
                 maxSize = std::max(maxSize, vertex4[i]);
             }
 
-            vertex0 *= scale;
-            vertex1 *= scale;
-            vertex2 *= scale;
-            vertex4 *= scale;
+            vertex0 = glm::vec4(glm::dvec4(vertex0) * scale);
+            vertex1 = glm::vec4(glm::dvec4(vertex1) * scale);
+            vertex2 = glm::vec4(glm::dvec4(vertex2) * scale);
+            vertex4 = glm::vec4(glm::dvec4(vertex4) * scale);
 
-            GLfloat vertexData[] = {
+            const std::array<GLfloat, 36> VertexData = {
                 //  x          y          z       w    s    t
                 vertex0.x, vertex0.y, vertex0.z, 1.f, 0.f, 0.f,
                 vertex1.x, vertex1.y, vertex1.z, 1.f, 1.f, 1.f,
@@ -1165,12 +740,12 @@ void RenderablePlanesCloud::createPlanes() {
                 vertex1.x, vertex1.y, vertex1.z, 1.f, 1.f, 1.f,
             };
 
-            int textureIndex = static_cast<int>(_fullData[p + _textureVariableIndex]);
+            int textureIndex = static_cast<int>(e.data[_dataset.textureDataIndex]);
             std::unordered_map<int, PlaneAggregate>::iterator found =
                 _planesMap.find(textureIndex);
             if (found != _planesMap.end()) {
-                for (int i = 0; i < PLANES_VERTEX_DATA_SIZE; ++i) {
-                    found->second.planesCoordinates.push_back(vertexData[i]);
+                for (int i = 0; i < PlanesVertexDataSize; ++i) {
+                    found->second.planesCoordinates.push_back(VertexData[i]);
                 }
                 found->second.numberOfPlanes++;
             }
@@ -1180,10 +755,10 @@ void RenderablePlanesCloud::createPlanes() {
                 glGenVertexArrays(1, &pA.vao);
                 glGenBuffers(1, &pA.vbo);
                 pA.numberOfPlanes = 1;
-                for (int i = 0; i < PLANES_VERTEX_DATA_SIZE; ++i) {
-                    pA.planesCoordinates.push_back(vertexData[i]);
+                for (int i = 0; i < PlanesVertexDataSize; ++i) {
+                    pA.planesCoordinates.push_back(VertexData[i]);
                 }
-                _planesMap.insert(std::pair<int, PlaneAggregate>(textureIndex, pA));
+                _planesMap.insert(std::pair(textureIndex, pA));
             }
         }
 
@@ -1193,21 +768,13 @@ void RenderablePlanesCloud::createPlanes() {
             glBindBuffer(GL_ARRAY_BUFFER, pAMapItem.second.vbo);
             glBufferData(
                 GL_ARRAY_BUFFER,
-                sizeof(GLfloat) * PLANES_VERTEX_DATA_SIZE *
-                    pAMapItem.second.numberOfPlanes,
+                sizeof(GLfloat) * PlanesVertexDataSize * pAMapItem.second.numberOfPlanes,
                 pAMapItem.second.planesCoordinates.data(),
                 GL_STATIC_DRAW
             );
             // in_position
             glEnableVertexAttribArray(0);
-            glVertexAttribPointer(
-                0,
-                4,
-                GL_FLOAT,
-                GL_FALSE,
-                sizeof(GLfloat) * 6,
-                nullptr
-            );
+            glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), nullptr);
 
             // texture coords
             glEnableVertexAttribArray(1);
@@ -1216,8 +783,8 @@ void RenderablePlanesCloud::createPlanes() {
                 2,
                 GL_FLOAT,
                 GL_FALSE,
-                sizeof(GLfloat) * 6,
-                reinterpret_cast<GLvoid*>(sizeof(GLfloat) * 4)
+                6 * sizeof(GLfloat),
+                reinterpret_cast<GLvoid*>(4 * sizeof(GLfloat))
             );
 
             glBindVertexArray(0);
@@ -1226,7 +793,7 @@ void RenderablePlanesCloud::createPlanes() {
         _dataIsDirty = false;
 
         setBoundingSphere(maxRadius * _scaleFactor);
-        _fadeInDistance.setMaxValue(glm::vec2(10.f * maxSize));
+        _fadeInDistances.setMaxValue(glm::vec2(10.f * maxSize));
     }
 
     if (_hasLabel && _labelDataIsDirty) {
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.h b/modules/digitaluniverse/rendering/renderableplanescloud.h
index 9123200e5c..de2d2386cd 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.h
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.h
@@ -27,6 +27,7 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <modules/space/speckloader.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
@@ -50,7 +51,6 @@ namespace ghoul::opengl {
 namespace openspace {
 
 // (x, y, z, w, s, t) * 6 = 36
-const int PLANES_VERTEX_DATA_SIZE = 36;
 
 namespace documentation { struct Documentation; }
 
@@ -98,12 +98,7 @@ private:
         const glm::dmat4& modelViewProjectionMatrix, const glm::dvec3& orthoRight,
         const glm::dvec3& orthoUp, float fadeInVariable);
 
-    bool loadData();
-    bool loadTextures();
-    bool readSpeckFile();
-    bool readLabelFile();
-    bool loadCachedFile(const std::string& file);
-    bool saveCachedFile(const std::string& file) const;
+    void loadTextures();
 
     bool _hasSpeckFile = false;
     bool _dataIsDirty = true;
@@ -113,8 +108,6 @@ private:
 
     int _textMinSize = 0;
     int _textMaxSize = 200;
-    int _planeStartingIndexPos = 0;
-    int _textureVariableIndex = 0;
 
     properties::FloatProperty _scaleFactor;
     properties::Vec3Property _textColor;
@@ -122,16 +115,15 @@ private:
     properties::FloatProperty _textSize;
     properties::BoolProperty _drawElements;
     properties::OptionProperty _blendMode;
-    properties::Vec2Property _fadeInDistance;
+    properties::Vec2Property _fadeInDistances;
     properties::BoolProperty _disableFadeInDistance;
     properties::FloatProperty _planeMinSize;
-
-    // DEBUG:
     properties::OptionProperty _renderOption;
 
     ghoul::opengl::ProgramObject* _program = nullptr;
-    UniformCache(modelViewProjectionTransform, alphaValue, fadeInValue,
-        galaxyTexture) _uniformCache;
+    UniformCache(
+        modelViewProjectionTransform, alphaValue, fadeInValue, galaxyTexture
+    ) _uniformCache;
     std::shared_ptr<ghoul::fontrendering::Font> _font = nullptr;
     std::unordered_map<int, std::unique_ptr<ghoul::opengl::Texture>> _textureMap;
     std::unordered_map<int, std::string> _textureFileMap;
@@ -144,18 +136,14 @@ private:
 
     Unit _unit = Parsec;
 
-    std::vector<float> _fullData;
-    std::vector<std::pair<glm::vec3, std::string>> _labelData;
-    std::unordered_map<std::string, int> _variableDataPositionMap;
-
-    int _nValuesPerAstronomicalObject = 0;
+    speck::Dataset _dataset;
+    speck::Labelset _labelset;
 
     float _sluminosity = 1.f;
 
     glm::dmat4 _transformationMatrix = glm::dmat4(1.0);
 };
 
-
 } // namespace openspace
 
 #endif // __OPENSPACE_MODULE_DIGITALUNIVERSE___RENDERABLEPLANESCLOUD___H__
diff --git a/modules/digitaluniverse/rendering/renderablepoints.cpp b/modules/digitaluniverse/rendering/renderablepoints.cpp
index 96c5420b91..286e247d96 100644
--- a/modules/digitaluniverse/rendering/renderablepoints.cpp
+++ b/modules/digitaluniverse/rendering/renderablepoints.cpp
@@ -40,6 +40,7 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <array>
+#include <filesystem>
 #include <fstream>
 #include <locale>
 #include <cstdint>
@@ -54,7 +55,6 @@ namespace {
         "spriteTexture", "hasColorMap"
     };
 
-    constexpr int8_t CurrentCacheVersion = 1;
     constexpr double PARSEC = 0.308567756E17;
 
     constexpr openspace::properties::Property::PropertyInfo SpriteTextureInfo = {
@@ -116,9 +116,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderablePoints::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "digitaluniverse_renderablepoints";
-    return doc;
+    return codegen::doc<Parameters>("digitaluniverse_renderablepoints");
 }
 
 RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
@@ -137,7 +135,7 @@ RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    _speckFile = absPath(p.file);
+    _speckFile = absPath(p.file).string();
 
     if (p.unit.has_value()) {
         switch (*p.unit) {
@@ -174,22 +172,20 @@ RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
     addProperty(_pointColor);
 
     if (p.texture.has_value()) {
-        _spriteTexturePath = absPath(*p.texture);
+        _spriteTexturePath = absPath(*p.texture).string();
         _spriteTextureFile = std::make_unique<ghoul::filesystem::File>(
-            _spriteTexturePath
+            _spriteTexturePath.value()
         );
 
-        _spriteTexturePath.onChange([&] { _spriteTextureIsDirty = true; });
-        _spriteTextureFile->setCallback(
-            [&](const ghoul::filesystem::File&) { _spriteTextureIsDirty = true; }
-        );
+        _spriteTexturePath.onChange([this]() { _spriteTextureIsDirty = true; });
+        _spriteTextureFile->setCallback([this]() { _spriteTextureIsDirty = true; });
         addProperty(_spriteTexturePath);
 
         _hasSpriteTexture = true;
     }
 
     if (p.colorMap.has_value()) {
-        _colorMapFile = absPath(*p.colorMap);
+        _colorMapFile = absPath(*p.colorMap).string();
         _hasColorMapFile = true;
     }
 
@@ -198,26 +194,22 @@ RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
 }
 
 bool RenderablePoints::isReady() const {
-    return (_program != nullptr) && (!_fullData.empty());
+    return _program && (!_dataset.entries.empty());
 }
 
 void RenderablePoints::initialize() {
     ZoneScoped
 
-    bool success = loadData();
-    if (!success) {
-        throw ghoul::RuntimeError("Error loading data");
+    _dataset = speck::data::loadFileWithCache(_speckFile);
+
+    if (_hasColorMapFile) {
+         readColorMapFile();
     }
 }
 
 void RenderablePoints::initializeGL() {
     ZoneScoped
 
-    // OBS:  The ProgramObject name is later used to release the program as well, so the
-    //       name parameter to requestProgramObject and the first parameter to
-    //       buildRenderProgram has to be the same or an assertion will be thrown at the
-    //       end of the program.
-
     if (_hasSpriteTexture) {
         _program = DigitalUniverseModule::ProgramObjectManager.request(
             "RenderablePoints Sprite",
@@ -289,10 +281,7 @@ void RenderablePoints::render(const RenderData& data, RendererTasks&) {
 
     glEnable(GL_PROGRAM_POINT_SIZE);
     glBindVertexArray(_vao);
-    const GLsizei nAstronomicalObjects = static_cast<GLsizei>(
-        _fullData.size() / _nValuesPerAstronomicalObject
-    );
-    glDrawArrays(GL_POINTS, 0, nAstronomicalObjects);
+    glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_dataset.entries.size()));
 
     glDisable(GL_PROGRAM_POINT_SIZE);
     glBindVertexArray(0);
@@ -305,7 +294,7 @@ void RenderablePoints::update(const UpdateData&) {
     if (_dataIsDirty) {
         LDEBUG("Regenerating data");
 
-        createDataSlice();
+        std::vector<double> slice = createDataSlice();
 
         if (_vao == 0) {
             glGenVertexArrays(1, &_vao);
@@ -318,19 +307,13 @@ void RenderablePoints::update(const UpdateData&) {
         glBindBuffer(GL_ARRAY_BUFFER, _vbo);
         glBufferData(
             GL_ARRAY_BUFFER,
-            _slicedData.size() * sizeof(double),
-            &_slicedData[0],
+            slice.size() * sizeof(double),
+            slice.data(),
             GL_STATIC_DRAW
         );
         GLint positionAttrib = _program->attributeLocation("in_position");
 
         if (_hasColorMapFile) {
-
-            // const size_t nAstronomicalObjects = _fullData.size() /
-                                                        // _nValuesPerAstronomicalObject;
-            // const size_t nValues = _slicedData.size() / nAstronomicalObjects;
-            // GLsizei stride = static_cast<GLsizei>(sizeof(double) * nValues);
-
             glEnableVertexAttribArray(positionAttrib);
             glVertexAttribLPointer(
                 positionAttrib, 4, GL_DOUBLE, sizeof(double) * 8, nullptr
@@ -342,8 +325,8 @@ void RenderablePoints::update(const UpdateData&) {
                 colorMapAttrib,
                 4,
                 GL_DOUBLE,
-                sizeof(double) * 8,
-                reinterpret_cast<void*>(sizeof(double) * 4)
+                8 * sizeof(double),
+                reinterpret_cast<void*>(4 * sizeof(double))
             );
         }
         else {
@@ -361,7 +344,7 @@ void RenderablePoints::update(const UpdateData&) {
         _spriteTexture = nullptr;
         if (!_spriteTexturePath.value().empty()) {
             _spriteTexture = ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_spriteTexturePath)
+                absPath(_spriteTexturePath).string()
             );
             if (_spriteTexture) {
                 LDEBUG(fmt::format(
@@ -374,134 +357,20 @@ void RenderablePoints::update(const UpdateData&) {
             );
 
             _spriteTextureFile = std::make_unique<ghoul::filesystem::File>(
-                _spriteTexturePath
-            );
-            _spriteTextureFile->setCallback(
-                [&](const ghoul::filesystem::File&) { _spriteTextureIsDirty = true; }
+                _spriteTexturePath.value()
             );
+            _spriteTextureFile->setCallback([this]() { _spriteTextureIsDirty = true; });
         }
         _spriteTextureIsDirty = false;
     }
 }
 
-bool RenderablePoints::loadData() {
-    std::string cachedFile = FileSys.cacheManager()->cachedFilename(
-        _speckFile,
-        ghoul::filesystem::CacheManager::Persistent::Yes
-    );
-
-    bool hasCachedFile = FileSys.fileExists(cachedFile);
-    if (hasCachedFile) {
-        LINFO(fmt::format(
-            "Cached file '{}' used for Speck file '{}'",
-            cachedFile, _speckFile
-        ));
-
-        bool success = loadCachedFile(cachedFile);
-        if (success) {
-            if (_hasColorMapFile) {
-                success &= readColorMapFile();
-            }
-            return success;
-        }
-        else {
-            FileSys.cacheManager()->removeCacheFile(_speckFile);
-            // Intentional fall-through to the 'else' to generate the cache file for
-            // the next run
-        }
-    }
-    else {
-        LINFO(fmt::format("Cache for Speck file '{}' not found", _speckFile));
-    }
-    LINFO(fmt::format("Loading Speck file '{}'", _speckFile));
-
-    bool success = readSpeckFile();
-    if (!success) {
-        return false;
-    }
-
-    LINFO("Saving cache");
-    success = saveCachedFile(cachedFile);
-
-    if (_hasColorMapFile) {
-        success &= readColorMapFile();
-    }
-
-    return success;
-}
-
-bool RenderablePoints::readSpeckFile() {
-    std::ifstream file(_speckFile);
-    if (!file.good()) {
-        LERROR(fmt::format("Failed to open Speck file '{}'", _speckFile));
-        return false;
-    }
-
-    _nValuesPerAstronomicalObject = 0;
-
-    // The beginning of the speck file has a header that either contains comments
-    // (signaled by a preceding '#') or information about the structure of the file
-    // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
-    std::string line;
-    while (true) {
-        std::streampos position = file.tellg();
-        std::getline(file, line);
-
-        if (line[0] == '#' || line.empty()) {
-            continue;
-        }
-
-        if (line.substr(0, 7) != "datavar" &&
-            line.substr(0, 10) != "texturevar" &&
-            line.substr(0, 7) != "texture")
-        {
-            // we read a line that doesn't belong to the header, so we have to jump
-            // back before the beginning of the current line
-            file.seekg(position);
-            break;
-        }
-
-        if (line.substr(0, 7) == "datavar") {
-            // datavar lines are structured as follows:
-            // datavar # description
-            // where # is the index of the data variable; so if we repeatedly
-            // overwrite the 'nValues' variable with the latest index, we will end up
-            // with the total number of values (+3 since X Y Z are not counted in the
-            // Speck file index)
-            std::stringstream str(line);
-
-            std::string dummy;
-            str >> dummy;
-            str >> _nValuesPerAstronomicalObject;
-            // We want the number, but the index is 0 based
-            _nValuesPerAstronomicalObject += 1;
-        }
-    }
-
-    // X Y Z are not counted in the Speck file indices
-    _nValuesPerAstronomicalObject += 3;
-
-    do {
-        std::vector<float> values(_nValuesPerAstronomicalObject);
-
-        std::getline(file, line);
-        std::stringstream str(line);
-
-        for (int i = 0; i < _nValuesPerAstronomicalObject; ++i) {
-            str >> values[i];
-        }
-
-        _fullData.insert(_fullData.end(), values.begin(), values.end());
-    } while (!file.eof());
-
-    return true;
-}
-
-bool RenderablePoints::readColorMapFile() {
+void RenderablePoints::readColorMapFile() {
     std::ifstream file(_colorMapFile);
     if (!file.good()) {
-        LERROR(fmt::format("Failed to open Color Map file '{}'", _colorMapFile));
-        return false;
+        throw ghoul::RuntimeError(fmt::format(
+            "Failed to open Color Map file '{}'", _colorMapFile
+        ));
     }
 
     std::size_t numberOfColors = 0;
@@ -526,7 +395,9 @@ bool RenderablePoints::readColorMapFile() {
             break;
         }
         else if (file.eof()) {
-            return false;
+            throw ghoul::RuntimeError(fmt::format(
+                "Failed to load colors from Color Map file '{}'", _colorMapFile
+            ));
         }
     }
 
@@ -535,106 +406,26 @@ bool RenderablePoints::readColorMapFile() {
         std::stringstream str(line);
 
         glm::vec4 color;
-        for (int j = 0; j < 4; ++j) {
-            str >> color[j];
-        }
+        str >> color.r >> color.g >> color.b >> color.a;
 
         _colorMapData.push_back(color);
     }
-
-    return true;
 }
 
-bool RenderablePoints::loadCachedFile(const std::string& file) {
-    std::ifstream fileStream(file, std::ifstream::binary);
-    if (fileStream.good()) {
-        int8_t version = 0;
-        fileStream.read(reinterpret_cast<char*>(&version), sizeof(int8_t));
-        if (version != CurrentCacheVersion) {
-            LINFO("The format of the cached file has changed: deleting old cache");
-            fileStream.close();
-            FileSys.deleteFile(file);
-            return false;
-        }
-
-        int32_t nValues = 0;
-        fileStream.read(reinterpret_cast<char*>(&nValues), sizeof(int32_t));
-        fileStream.read(
-            reinterpret_cast<char*>(&_nValuesPerAstronomicalObject),
-            sizeof(int32_t)
-        );
-
-        _fullData.resize(nValues);
-        fileStream.read(reinterpret_cast<char*>(
-            &_fullData[0]),
-            nValues * sizeof(_fullData[0])
-        );
-
-        const bool success = fileStream.good();
-        return success;
-    }
-    else {
-        LERROR(fmt::format(
-            "Error opening file '{}' for loading cache file",
-            file
-        ));
-        return false;
-    }
-}
-
-bool RenderablePoints::saveCachedFile(const std::string& file) const {
-    std::ofstream fileStream(file, std::ofstream::binary);
-    if (fileStream.good()) {
-        fileStream.write(
-            reinterpret_cast<const char*>(&CurrentCacheVersion),
-            sizeof(int8_t)
-        );
-
-        const int32_t nValues = static_cast<int32_t>(_fullData.size());
-        if (nValues == 0) {
-            LERROR("Error writing cache: No values were loaded");
-            return false;
-        }
-        fileStream.write(reinterpret_cast<const char*>(&nValues), sizeof(int32_t));
-
-        const int32_t nValuesPerAstronomicalObject = static_cast<int32_t>(
-            _nValuesPerAstronomicalObject
-        );
-        fileStream.write(
-            reinterpret_cast<const char*>(&nValuesPerAstronomicalObject),
-            sizeof(int32_t)
-        );
-
-        const size_t nBytes = nValues * sizeof(_fullData[0]);
-        fileStream.write(reinterpret_cast<const char*>(&_fullData[0]), nBytes);
-
-        const bool success = fileStream.good();
-        return success;
-    }
-    else {
-        LERROR(fmt::format("Error opening file '{}' for save cache file", file));
-        return false;
-    }
-}
-
-void RenderablePoints::createDataSlice() {
-    _slicedData.clear();
+std::vector<double> RenderablePoints::createDataSlice() {
+    std::vector<double> slice;
     if (_hasColorMapFile) {
-        _slicedData.reserve(8 * (_fullData.size() / _nValuesPerAstronomicalObject));
+        slice.reserve(8 * _dataset.entries.size());
     }
     else {
-        _slicedData.reserve(4 * (_fullData.size()/_nValuesPerAstronomicalObject));
+        slice.reserve(4 * _dataset.entries.size());
     }
 
     int colorIndex = 0;
-    for (size_t i = 0; i < _fullData.size(); i += _nValuesPerAstronomicalObject) {
-        glm::dvec3 p = glm::dvec3(
-            _fullData[i + 0],
-            _fullData[i + 1],
-            _fullData[i + 2]
-        );
+    for (const speck::Dataset::Entry& e : _dataset.entries) {
+        glm::dvec3 p = e.position;
 
-        // Converting untis
+        // Converting units
         if (_unit == Kilometer) {
             p *= 1E3;
         }
@@ -658,15 +449,15 @@ void RenderablePoints::createDataSlice() {
 
         if (_hasColorMapFile) {
             for (int j = 0; j < 4; ++j) {
-                _slicedData.push_back(position[j]);
+                slice.push_back(position[j]);
             }
             for (int j = 0; j < 4; ++j) {
-                _slicedData.push_back(_colorMapData[colorIndex][j]);
+                slice.push_back(_colorMapData[colorIndex][j]);
             }
         }
         else {
             for (int j = 0; j < 4; ++j) {
-                _slicedData.push_back(position[j]);
+                slice.push_back(position[j]);
             }
         }
 
@@ -674,6 +465,8 @@ void RenderablePoints::createDataSlice() {
             0 :
             colorIndex + 1;
     }
+
+    return slice;
 }
 
 } // namespace openspace
diff --git a/modules/digitaluniverse/rendering/renderablepoints.h b/modules/digitaluniverse/rendering/renderablepoints.h
index b842a90deb..0f7c4f1361 100644
--- a/modules/digitaluniverse/rendering/renderablepoints.h
+++ b/modules/digitaluniverse/rendering/renderablepoints.h
@@ -27,6 +27,7 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <modules/space/speckloader.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
@@ -63,7 +64,6 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-
     enum Unit {
         Meter = 0,
         Kilometer = 1,
@@ -74,13 +74,9 @@ private:
         GigalightYears = 6
     };
 
-    void createDataSlice();
+    std::vector<double> createDataSlice();
 
-    bool loadData();
-    bool readSpeckFile();
-    bool readColorMapFile();
-    bool loadCachedFile(const std::string& file);
-    bool saveCachedFile(const std::string& file) const;
+    void readColorMapFile();
 
     bool _dataIsDirty = true;
     bool _hasSpriteTexture = false;
@@ -94,19 +90,20 @@ private:
     std::unique_ptr<ghoul::opengl::Texture> _spriteTexture;
     std::unique_ptr<ghoul::filesystem::File> _spriteTextureFile;
     ghoul::opengl::ProgramObject* _program = nullptr;
-    UniformCache(modelViewProjectionTransform, color, sides, alphaValue, scaleFactor,
-        spriteTexture, hasColorMap) _uniformCache;
+    UniformCache(
+        modelViewProjectionTransform, color, sides, alphaValue, scaleFactor,
+        spriteTexture, hasColorMap
+    ) _uniformCache;
 
     std::string _speckFile;
     std::string _colorMapFile;
 
     Unit _unit = Parsec;
 
-    std::vector<double> _slicedData;
-    std::vector<float> _fullData;
+    speck::Dataset _dataset;
     std::vector<glm::vec4> _colorMapData;
 
-    int _nValuesPerAstronomicalObject = 0;
+    //int _nValuesPerAstronomicalObject = 0;
 
     GLuint _vao = 0;
     GLuint _vbo = 0;
diff --git a/modules/digitaluniverse/shaders/billboard_fs.glsl b/modules/digitaluniverse/shaders/billboard_fs.glsl
index 678b20592a..203310715a 100644
--- a/modules/digitaluniverse/shaders/billboard_fs.glsl
+++ b/modules/digitaluniverse/shaders/billboard_fs.glsl
@@ -29,47 +29,44 @@ flat in float vs_screenSpaceDepth;
 in vec2 texCoord;
 in float ta;
 
-uniform float alphaValue; // opacity
+uniform float alphaValue;
 uniform vec3 color;
 uniform sampler2D spriteTexture;
 uniform bool hasColorMap;
 uniform float fadeInValue;
 
 Fragment getFragment() {
-    vec4 textureColor = texture(spriteTexture, texCoord);
+  if (gs_colorMap.a == 0.0 || ta == 0.0 || fadeInValue == 0.0 || alphaValue == 0.0) {
+    discard;
+  }
+
+  vec4 textureColor = texture(spriteTexture, texCoord);
+  if (textureColor.a == 0.0) {
+    discard;
+  }
+
+  vec4 fullColor = textureColor;
     
-    if (textureColor.a == 0.f || gs_colorMap.a == 0.f || ta == 0.f || fadeInValue == 0.f)
-    {
-        discard;
-    }
+  if (hasColorMap) {
+    fullColor *= gs_colorMap;
+  }
+  else {
+    fullColor.rgb *= color;
+  }
 
-    vec4 fullColor = vec4(1.0);
-    
-    if (hasColorMap) {
-        fullColor = vec4(
-            gs_colorMap.rgb * textureColor.rgb,
-            gs_colorMap.a * textureColor.a * alphaValue
-        );
-    }
-    else {
-        fullColor = vec4(color.rgb * textureColor.rgb, textureColor.a * alphaValue);
-    }
+  float textureOpacity = dot(fullColor.rgb, vec3(1.0));
+  if (textureOpacity == 0.0) {
+    discard;
+  }
 
-    fullColor.a *= fadeInValue * ta;
-    
-    float textureOpacity = dot(fullColor.rgb, vec3(1.0));
-    if (fullColor.a == 0.f || textureOpacity == 0.0) {
-        discard;
-    }
+  fullColor.a *= alphaValue * fadeInValue * ta;
 
-    Fragment frag;
-    frag.color = fullColor;
-    frag.depth = vs_screenSpaceDepth;
-    // Setting the position of the billboards to not interact 
-    // with the ATM.
-    frag.gPosition = vec4(-1e32, -1e32, -1e32, 1.0);
-    frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
-    //frag.disableLDR2HDR = true;
+  Fragment frag;
+  frag.color = fullColor;
+  frag.depth = vs_screenSpaceDepth;
+  // Setting the position of the billboards to not interact with the ATM
+  frag.gPosition = vec4(-1e32, -1e32, -1e32, 1.0);
+  frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
 
-    return frag;
+  return frag;
 }
diff --git a/modules/digitaluniverse/shaders/billboard_gs.glsl b/modules/digitaluniverse/shaders/billboard_gs.glsl
index e2f7fb4fc7..0fa9023e8e 100644
--- a/modules/digitaluniverse/shaders/billboard_gs.glsl
+++ b/modules/digitaluniverse/shaders/billboard_gs.glsl
@@ -29,117 +29,110 @@
 layout(points) in;
 layout(triangle_strip, max_vertices = 4) out;
 
-uniform float scaleFactor;
-uniform vec3 up;
-uniform vec3 right;
-uniform dvec3 cameraPosition; // in world space (no SGCT View was considered)
-uniform vec3 cameraLookUp;   // in world space (no SGCT View was considered)
-uniform int renderOption;
-uniform vec2 screenSize;
-uniform float maxBillboardSize;
-uniform float minBillboardSize;
-
-uniform mat4 cameraViewProjectionMatrix;
-uniform dmat4 modelMatrix;
-
-uniform float correctionSizeFactor;
-uniform float correctionSizeEndDistance;
-
-uniform bool enabledRectSizeControl;
-
-uniform bool hasDvarScaling;
-
 flat in vec4 colorMap[];
 flat in float dvarScaling[];
 
 flat out vec4 gs_colorMap;
-
 out vec2 texCoord;
 flat out float vs_screenSpaceDepth;
 out float ta;
 
+// General settings
+uniform float scaleFactor;
+uniform int renderOption;
+uniform mat4 cameraViewProjectionMatrix;
+uniform dmat4 modelMatrix;
+uniform bool enabledRectSizeControl;
+uniform bool hasDvarScaling;
+
+// RenderOption: CameraViewDirection
+uniform vec3 up;
+uniform vec3 right;
+
+// RenderOption: CameraPositionNormal
+uniform dvec3 cameraPosition;
+uniform vec3 cameraLookUp;
+uniform float correctionSizeFactor;
+uniform float correctionSizeEndDistance;
+
+// Pixel size control: true
+uniform vec2 screenSize;
+uniform float maxBillboardSize;
+uniform float minBillboardSize;
+
 const double PARSEC = 0.308567756e17LF;
 
 const vec2 corners[4] = vec2[4]( 
-    vec2(0.0, 0.0),
-    vec2(1.0, 0.0), 
-    vec2(1.0, 1.0),
-    vec2(0.0, 1.0)     
+  vec2(0.0, 0.0),
+  vec2(1.0, 0.0), 
+  vec2(1.0, 1.0),
+  vec2(0.0, 1.0)     
 );
 
+const int RenderOptionCameraViewDirection = 0;
+const int RenderOptionCameraPositionNormal = 1;
 
 void main() {
-    ta             = 1.0f;
-    vec4 pos       = gl_in[0].gl_Position; // in object space
-    gs_colorMap    = colorMap[0];
+    ta = 1.0;
+    vec4 pos = gl_in[0].gl_Position;
+    gs_colorMap = colorMap[0];
     
-    double unit    = PARSEC;
+    double unit = PARSEC;
 
     // Must be the same as the enum in RenderableBillboardsCloud.h
-    if (pos.w == 1.f) {
-        unit = 1E3;
-    }
-    else if (pos.w == 2.f) {
-        unit = PARSEC;
-    }
-    else if (pos.w == 3.f) {
-        unit = 1E3 * PARSEC;
-    }
-    else if (pos.w == 4.f) {
-        unit = 1E6 * PARSEC;
-    }
-    else if (pos.w == 5.f) {
-        unit = 1E9 * PARSEC;
-    }
-    else if (pos.w == 6.f) {
-        // Convertion factor from Parsecs to GigalightYears
+    if (pos.w == 1.0) { unit = 1E3; }
+    else if (pos.w == 2.0) { unit = PARSEC; }
+    else if (pos.w == 3.0) { unit = 1E3 * PARSEC; }
+    else if (pos.w == 4.0) { unit = 1E6 * PARSEC; }
+    else if (pos.w == 5.0) { unit = 1E9 * PARSEC; }
+    else if (pos.w == 6.0) {
+        // Conversion factor from Parsecs to GigalightYears
         unit = 306391534.73091 * PARSEC;
     }
 
-    dvec4 dpos = dvec4(dvec3(pos.xyz) * unit, 1.0); 
-    dpos = modelMatrix * dpos;
+    dvec4 dpos = modelMatrix * dvec4(dvec3(pos.xyz) * unit, 1.0);
 
-    float scaleMultiply = exp(scaleFactor * 0.10f);
-    scaleMultiply        = hasDvarScaling ? dvarScaling[0] * scaleMultiply : scaleMultiply;
-    
-    vec3 scaledRight    = vec3(0.f);
-    vec3 scaledUp       = vec3(0.f);
-    
-    vec4 initialPosition, secondPosition, thirdPosition, crossCorner;
-  
-    if (renderOption == 0) { // Camera View Direction
-        scaledRight = scaleMultiply * right * 0.5f;
-        scaledUp    = scaleMultiply * up * 0.5f;
+    float scaleMultiply = exp(scaleFactor * 0.10);
+    if (hasDvarScaling) {
+        scaleMultiply *= dvarScaling[0];
     }
-    else if (renderOption == 1) { // Camera Position Normal
-        vec3 normal   = vec3(normalize(cameraPosition - dpos.xyz));
+    
+    vec3 scaledRight = vec3(0.0);
+    vec3 scaledUp = vec3(0.0);
+    
+    if (renderOption == RenderOptionCameraViewDirection) {
+        scaledRight = scaleMultiply * right * 0.5;
+        scaledUp = scaleMultiply * up * 0.5;
+    }
+    else if (renderOption == RenderOptionCameraPositionNormal) {
+        vec3 normal = vec3(normalize(cameraPosition - dpos.xyz));
         vec3 newRight = normalize(cross(cameraLookUp, normal));
-        vec3 newUp    = cross(normal, newRight);
+        vec3 newUp = cross(normal, newRight);
 
         if (!enabledRectSizeControl) {
             double distCamera = length(cameraPosition - dpos.xyz);
-            float expVar = float(-distCamera) / pow(10.f, correctionSizeEndDistance);
-            float factorVar = pow(10.f, correctionSizeFactor);
-            scaleMultiply *= 1.f / (1.f + factorVar * exp(expVar));
+            float expVar = float(-distCamera) / pow(10.0, correctionSizeEndDistance);
+            float factorVar = pow(10.0, correctionSizeFactor);
+            scaleMultiply *= 1.0 / (1.0 + factorVar * exp(expVar));
         }
 
-        scaledRight    = scaleMultiply * newRight * 0.5f;
-        scaledUp       = scaleMultiply * newUp * 0.5f;
+        scaledRight = scaleMultiply * newRight * 0.5;
+        scaledUp = scaleMultiply * newUp * 0.5;
     }
     
     if (enabledRectSizeControl) {
-        initialPosition = z_normalization(cameraViewProjectionMatrix * 
+        vec4 initialPosition = z_normalization(cameraViewProjectionMatrix * 
             vec4(vec3(dpos.xyz) - scaledRight - scaledUp, dpos.w));
         
         vs_screenSpaceDepth = initialPosition.w;
         
-        crossCorner = z_normalization(cameraViewProjectionMatrix * 
+        vec4 crossCorner = z_normalization(cameraViewProjectionMatrix * 
             vec4(vec3(dpos.xyz) + scaledUp + scaledRight, dpos.w));
         
         // Testing size for rectangular viewport:
-        vec2 halfViewSize = vec2(screenSize.x, screenSize.y) * 0.5f;
-        vec2 topRight = crossCorner.xy/crossCorner.w;
-        vec2 bottomLeft = initialPosition.xy/initialPosition.w;
+        vec2 halfViewSize = screenSize * 0.5;
+        vec2 topRight = crossCorner.xy / crossCorner.w;
+        vec2 bottomLeft = initialPosition.xy / initialPosition.w;
         
         // width and height
         vec2 sizes = abs(halfViewSize * (topRight - bottomLeft));
@@ -148,18 +141,18 @@ void main() {
             float correctionScale = maxBillboardSize / length(sizes);
             
             scaledRight *= correctionScale;
-            scaledUp    *= correctionScale;
-        
+            scaledUp *= correctionScale;
         }
         else {
             // linear alpha decay
-            if (sizes.x < 2.0f * minBillboardSize) {
-                float maxVar = 2.0f * minBillboardSize;
+            if (sizes.x < 2.0 * minBillboardSize) {
+                float maxVar = 2.0 * minBillboardSize;
                 float minVar = minBillboardSize;
-                float var    = (sizes.y + sizes.x);
-                ta = ( (var - minVar)/(maxVar - minVar) );
-                if (ta == 0.0f)
+                float var = sizes.y + sizes.x;
+                ta = (var - minVar) / (maxVar - minVar);
+                if (ta == 0.0) {
                     return;
+                }
             }
         }
     }
@@ -169,27 +162,26 @@ void main() {
     vec4 scaledRightClip = cameraViewProjectionMatrix * vec4(scaledRight, 0.0);
     vec4 scaledUpClip = cameraViewProjectionMatrix * vec4(scaledUp, 0.0);
 
-    initialPosition = z_normalization(dposClip - scaledRightClip - scaledUpClip);
+    vec4 initialPosition = z_normalization(dposClip - scaledRightClip - scaledUpClip);
     vs_screenSpaceDepth = initialPosition.w;
-    secondPosition = z_normalization(dposClip + scaledRightClip - scaledUpClip);
-    crossCorner = z_normalization(dposClip + scaledUpClip + scaledRightClip);
-    thirdPosition = z_normalization(dposClip + scaledUpClip - scaledRightClip);
+    vec4 secondPosition = z_normalization(dposClip + scaledRightClip - scaledUpClip);
+    vec4 crossCorner = z_normalization(dposClip + scaledUpClip + scaledRightClip);
+    vec4 thirdPosition = z_normalization(dposClip + scaledUpClip - scaledRightClip);
 
     // Build primitive
-
-    texCoord    = corners[0];
+    texCoord = corners[0];
     gl_Position = initialPosition;
     EmitVertex();
     
-    texCoord    = corners[1];
+    texCoord = corners[1];
     gl_Position = secondPosition;
     EmitVertex();
 
-    texCoord    = corners[3];
+    texCoord = corners[3];
     gl_Position = thirdPosition;
     EmitVertex();
         
-    texCoord    = corners[2];
+    texCoord = corners[2];
     gl_Position = crossCorner;
     EmitVertex();
     
diff --git a/modules/digitaluniverse/shaders/billboard_vs.glsl b/modules/digitaluniverse/shaders/billboard_vs.glsl
index 98517afeb5..53bd0bd9d8 100644
--- a/modules/digitaluniverse/shaders/billboard_vs.glsl
+++ b/modules/digitaluniverse/shaders/billboard_vs.glsl
@@ -34,7 +34,7 @@ flat out vec4 colorMap;
 flat out float dvarScaling;
 
 void main() {
-    colorMap    = in_colormap;
-    dvarScaling = in_dvarScaling;
-    gl_Position = in_position;
+  colorMap = in_colormap;
+  dvarScaling = in_dvarScaling;
+  gl_Position = in_position;
 }
diff --git a/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl b/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl
index 2bd88f5b90..6b6936eca4 100644
--- a/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl
+++ b/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl
@@ -25,7 +25,6 @@
 #version __CONTEXT__
 
 layout(points) in;
-//layout(line_strip, max_vertices = 19) out;
 layout(triangle_strip, max_vertices = 63) out;
 
 uniform int sides;
@@ -33,41 +32,24 @@ uniform int sides;
 const float PI = 3.1415926;
 
 void main() {
-    // for (int i = 0; i <= sides; i++) {
-    //     // Angle between each side in radians
-    //     float ang = PI * 2.0 / float(sides) * i;
-
-    //     // Offset from center of point (0.3 to accomodate for aspect ratio)
-    //     //vec4 offset = vec4(cos(ang) * 0.003, -sin(ang) * 0.004, 0.0, 0.0);
-    //     vec4 offset = vec4(cos(ang) * 0.8, -sin(ang) * 0.8, 0.0, 0.0);
-    //     gl_Position = gl_in[0].gl_Position + offset;
-
-    //     // vec4 offset = vec4(cos(ang) * gl_in[0].gl_Position[0], -sin(ang) * gl_in[0].gl_Position[1],
-    //     //                     gl_in[0].gl_Position[2] , gl_in[0].gl_Position[3]);
-    //     // gl_Position = offset;
-        
-    //     EmitVertex();
-    // }
-    // EndPrimitive();
+  vec4 v0 = gl_in[0].gl_Position;
     
-    vec4 v0 = gl_in[0].gl_Position;
-    
-    for (int i = sides; i > 0; --i) {
-        // Angle between each side in radians
-        float ang = PI * 2.0 / float(sides) * i;
+  for (int i = sides; i > 0; --i) {
+    // Angle between each side in radians
+    float ang = 2.0 * PI / float(sides) * i;
 
-        gl_Position = v0;
-        EmitVertex();
+    gl_Position = v0;
+    EmitVertex();
 
-        vec4 vi = v0 + vec4(cos(ang) * 0.8, -sin(ang) * 0.8, 0.0, 0.0);
-        gl_Position = vi;
-        EmitVertex();
+    vec4 vi = v0 + vec4(cos(ang) * 0.8, -sin(ang) * 0.8, 0.0, 0.0);
+    gl_Position = vi;
+    EmitVertex();
 
-        ang = PI * 2.0 / float(sides) * (i-1);
-        vec4 vii = v0 + vec4(cos(ang) * 0.8, -sin(ang) * 0.8, 0.0, 0.0);
-        gl_Position = vii;
-        EmitVertex();
+    ang = 2.0 * PI / float(sides) * (i - 1);
+    vec4 vii = v0 + vec4(cos(ang) * 0.8, -sin(ang) * 0.8, 0.0, 0.0);
+    gl_Position = vii;
+    EmitVertex();
 
-        EndPrimitive();
-    }
+    EndPrimitive();
+  }
 }
diff --git a/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl b/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl
index aead855d65..8e814f1955 100644
--- a/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl
+++ b/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl
@@ -27,5 +27,5 @@
 layout(location = 0) in vec4 in_position;
 
 void main() {
-    gl_Position = in_position;
+  gl_Position = in_position;
 }
diff --git a/modules/digitaluniverse/shaders/dumesh_fs.glsl b/modules/digitaluniverse/shaders/dumesh_fs.glsl
index 1e28d7ce69..a9a0507272 100644
--- a/modules/digitaluniverse/shaders/dumesh_fs.glsl
+++ b/modules/digitaluniverse/shaders/dumesh_fs.glsl
@@ -31,18 +31,18 @@ uniform vec3 color;
 uniform float alphaValue;
 
 Fragment getFragment() {
-    Fragment frag;
+  Fragment frag;
 
-    if (alphaValue == 0.0) {
-        discard;
-    }
+  if (alphaValue == 0.0) {
+    discard;
+  }
 
-    frag.color = vec4(color, alphaValue);
-    frag.depth = vs_screenSpaceDepth;
+  frag.color = vec4(color, alphaValue);
+  frag.depth = vs_screenSpaceDepth;
 
-    // JCC: Need to change the position to camera space
-    frag.gPosition  = vs_positionViewSpace;
-    frag.gNormal    = vec4(0.0, 0.0, 0.0, 1.0);
+  // 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;
+  return frag;
 }
diff --git a/modules/digitaluniverse/shaders/dumesh_vs.glsl b/modules/digitaluniverse/shaders/dumesh_vs.glsl
index 281d1d0a64..58f891144d 100644
--- a/modules/digitaluniverse/shaders/dumesh_vs.glsl
+++ b/modules/digitaluniverse/shaders/dumesh_vs.glsl
@@ -28,19 +28,19 @@
 
 in vec3 in_position;
 
-uniform dmat4 modelViewTransform;
-uniform dmat4 projectionTransform;
-
 out float vs_screenSpaceDepth;
 out vec4 vs_positionViewSpace;
 
+uniform dmat4 modelViewTransform;
+uniform dmat4 projectionTransform;
+
 void main() {
-    dvec4 positionViewSpace  = modelViewTransform * dvec4(in_position, 1.0);
-    vec4 positionClipSpace   = vec4(projectionTransform * positionViewSpace);
-    vec4 positionScreenSpace = vec4(z_normalization(positionClipSpace));
+  dvec4 positionViewSpace  = modelViewTransform * dvec4(in_position, 1.0);
+  vec4 positionClipSpace   = vec4(projectionTransform * positionViewSpace);
+  vec4 positionScreenSpace = vec4(z_normalization(positionClipSpace));
 
-    vs_screenSpaceDepth  = positionScreenSpace.w;
-    vs_positionViewSpace = vec4(positionViewSpace);
+  vs_screenSpaceDepth  = positionScreenSpace.w;
+  vs_positionViewSpace = vec4(positionViewSpace);
 
-    gl_Position = positionScreenSpace;
+  gl_Position = positionScreenSpace;
 }
diff --git a/modules/digitaluniverse/shaders/plane_fs.glsl b/modules/digitaluniverse/shaders/plane_fs.glsl
index 5282ce582e..c3a0a39965 100644
--- a/modules/digitaluniverse/shaders/plane_fs.glsl
+++ b/modules/digitaluniverse/shaders/plane_fs.glsl
@@ -28,37 +28,24 @@ in float vs_screenSpaceDepth;
 in vec2 vs_st;
 
 uniform sampler2D galaxyTexture;
-//uniform bool additiveBlending;
 uniform float alphaValue;
 uniform float fadeInValue;
 
-
 Fragment getFragment() {
-    Fragment frag;
-    // if (gl_FrontFacing) {
-    //     frag.color = texture(galaxyTexture, vs_st);
-    // }
-    // else {
-    //     frag.color = texture(galaxyTexture, vec2(1 - vs_st.s, vs_st.t));
-    // }
+  Fragment frag;
 
-    frag.color = texture(galaxyTexture, vs_st);
-    frag.color *= alphaValue;
+  frag.color = texture(galaxyTexture, vs_st);
+  frag.color *= alphaValue;
 
-    frag.color *= fadeInValue;
+  frag.color *= fadeInValue;
 
-    if (frag.color.a == 0.0) {
-        discard;
-    }
+  if (frag.color.a == 0.0) {
+    discard;
+  }
 
-    // if (additiveBlending) {
-    //     frag.blend = BLEND_MODE_ADDITIVE;
-    // }
+  frag.depth = vs_screenSpaceDepth;
+  frag.gPosition = vec4(vs_screenSpaceDepth, vs_screenSpaceDepth, vs_screenSpaceDepth, 1.0);
+  frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
 
-    //frag.color = texture(galaxyTexture, vs_st);
-    frag.depth      = vs_screenSpaceDepth;
-    frag.gPosition  = vec4(vs_screenSpaceDepth, vs_screenSpaceDepth, vs_screenSpaceDepth, 1.0);
-    frag.gNormal    = vec4(0.0, 0.0, 0.0, 1.0);
-
-    return frag;
+  return frag;
 }
diff --git a/modules/digitaluniverse/shaders/plane_vs.glsl b/modules/digitaluniverse/shaders/plane_vs.glsl
index cb84739b05..d373add7ec 100644
--- a/modules/digitaluniverse/shaders/plane_vs.glsl
+++ b/modules/digitaluniverse/shaders/plane_vs.glsl
@@ -34,12 +34,11 @@ out float vs_screenSpaceDepth;
 
 uniform dmat4 modelViewProjectionTransform;
 
-
 void main() {
-    vs_st = in_st;
-    vec4 positionClipSpace = vec4(modelViewProjectionTransform * dvec4(in_position));
-    vec4 positionScreenSpace = z_normalization(positionClipSpace);
+  vs_st = in_st;
+  vec4 positionClipSpace = vec4(modelViewProjectionTransform * dvec4(in_position));
+  vec4 positionScreenSpace = z_normalization(positionClipSpace);
 
-    vs_screenSpaceDepth = positionScreenSpace.w;
-    gl_Position = positionScreenSpace;
+  vs_screenSpaceDepth = positionScreenSpace.w;
+  gl_Position = positionScreenSpace;
 }
diff --git a/modules/digitaluniverse/shaders/points_gs.glsl b/modules/digitaluniverse/shaders/points_gs.glsl
deleted file mode 100644
index dc074d0484..0000000000
--- a/modules/digitaluniverse/shaders/points_gs.glsl
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#version __CONTEXT__
-
-layout(points) in;
-//layout(points, max_vertices = 13) out;
-layout(line_strip, max_vertices = 13) out;
-
-in float vs_screenSpaceDepth[];
-in float vs_scaleFactor[];
-in vec4 colorMap[]
-
-uniform int sides;
-
-out float gs_screenSpaceDepth;
-
-const float PI = 3.1415926;
-
-void main() {
-    gs_screenSpaceDepth = vs_screenSpaceDepth[0];
-    
-    for (int i = 0; i <= sides; i++) {
-        // Angle between each side in radians
-        float ang = PI * 2.0 / float(sides) * i;
-
-        // Offset from center of point (0.3 to accomodate for aspect ratio)
-        //vec4 offset = vec4(cos(ang) * 0.003, -sin(ang) * 0.004, 0.0, 0.0);
-        //gl_Position = gl_in[0].gl_Position + offset;
-
-        vec4 offset = vec4(cos(ang) * gl_in[0].gl_Position[0], -sin(ang) * gl_in[0].gl_Position[1],
-                            gl_in[0].gl_Position[2] , gl_in[0].gl_Position[3]);
-        gl_Position = offset;
-        
-        EmitVertex();
-    }
-    
-    //gl_Position = gl_in[0].gl_Position;// + offset;
-    //EmitVertex();
-
-    EndPrimitive();
-}
diff --git a/modules/digitaluniverse/shaders/points_sprite_fs.glsl b/modules/digitaluniverse/shaders/points_sprite_fs.glsl
index 03fdcfd916..1614127071 100644
--- a/modules/digitaluniverse/shaders/points_sprite_fs.glsl
+++ b/modules/digitaluniverse/shaders/points_sprite_fs.glsl
@@ -24,25 +24,23 @@
 
 #include "fragment.glsl"
 
-//in float gs_screenSpaceDepth;
 in float vs_screenSpaceDepth;
 
 uniform vec3 color;
 uniform float alphaValue;
-
 uniform sampler2D spriteTexture;
 
 Fragment getFragment() {
-    Fragment frag;
+  Fragment frag;
 
-    if (alphaValue == 0.0) {
-        discard;
-    }
+  if (alphaValue == 0.0) {
+    discard;
+  }
 
-    frag.color = texture(spriteTexture, gl_PointCoord) * vec4(color, alphaValue);
-    //frag.depth = gs_screenSpaceDepth;
-    frag.depth = vs_screenSpaceDepth;
-    frag.blend = BLEND_MODE_ADDITIVE;
+  frag.color = texture(spriteTexture, gl_PointCoord) * vec4(color, alphaValue);
+  //frag.depth = gs_screenSpaceDepth;
+  frag.depth = vs_screenSpaceDepth;
+  frag.blend = BLEND_MODE_ADDITIVE;
 
-    return frag;
+  return frag;
 }
diff --git a/modules/digitaluniverse/shaders/points_vs.glsl b/modules/digitaluniverse/shaders/points_vs.glsl
index a741bea69e..bf8aea92e4 100644
--- a/modules/digitaluniverse/shaders/points_vs.glsl
+++ b/modules/digitaluniverse/shaders/points_vs.glsl
@@ -29,23 +29,21 @@
 in dvec4 in_position;
 in dvec4 in_colormap;
 
-uniform dmat4 modelViewProjectionTransform;
-uniform float scaleFactor;
-
 out float vs_screenSpaceDepth;
 out float vs_scaleFactor;
 out vec4 colorMap;
 
+uniform dmat4 modelViewProjectionTransform;
+uniform float scaleFactor;
+
 void main() {
-    vec4 positionClipSpace = vec4(modelViewProjectionTransform * in_position);
-    // positionClipSpace = vec4( modelViewProjectionTransform * 
-    // vec4(0,0,0,1));
-    vec4 positionScreenSpace = vec4(z_normalization(positionClipSpace));
+  vec4 positionClipSpace = vec4(modelViewProjectionTransform * in_position);
+  vec4 positionScreenSpace = vec4(z_normalization(positionClipSpace));
 
-    vs_screenSpaceDepth = positionScreenSpace.w;
-    vs_scaleFactor = scaleFactor;
-    colorMap = vec4(in_colormap);
+  vs_screenSpaceDepth = positionScreenSpace.w;
+  vs_scaleFactor = scaleFactor;
+  colorMap = vec4(in_colormap);
 
-    gl_PointSize = scaleFactor;
-    gl_Position = positionScreenSpace;
+  gl_PointSize = scaleFactor;
+  gl_Position = positionScreenSpace;
 }
diff --git a/modules/digitaluniverse/shaders/pointssprite_vs.glsl b/modules/digitaluniverse/shaders/pointssprite_vs.glsl
deleted file mode 100644
index 7f06ce0d6a..0000000000
--- a/modules/digitaluniverse/shaders/pointssprite_vs.glsl
+++ /dev/null
@@ -1,48 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#version __CONTEXT__
-
-#include "PowerScaling/powerScaling_vs.hglsl"
-
-layout(location = 0) in vec4 in_position;
-layout(location = 1) in vec2 in_st;
-
-out vec2 vs_st;
-out float vs_screenSpaceDepth;
-out vec4 vs_positionScreenSpace;
-
-uniform mat4 modelViewProjectionTransform;
-
-
-void main() {
-    vec4 position = vec4(in_position.xyz * pow(10, in_position.w), 1);
-    vec4 positionClipSpace = modelViewProjectionTransform * position;
-    vec4 positionScreenSpace = z_normalization(positionClipSpace);
-
-    gl_Position = positionScreenSpace;
-
-    vs_st = in_st;
-    vs_screenSpaceDepth = positionScreenSpace.w;
-}
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index a918bb6ca1..4658cee9c2 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -199,14 +199,14 @@ ExoplanetsModule::ExoplanetsModule()
 
 std::string ExoplanetsModule::exoplanetsDataPath() const {
     return absPath(
-        fmt::format("{}/{}", _exoplanetsDataFolder, ExoplanetsDataFileName)
-    );
+        fmt::format("{}/{}", _exoplanetsDataFolder.value(), ExoplanetsDataFileName)
+    ).string();
 };
 
 std::string ExoplanetsModule::lookUpTablePath() const {
     return absPath(
         fmt::format("{}/{}", _exoplanetsDataFolder, LookupTableFileName)
-    );
+    ).string();
 };
 
 std::string ExoplanetsModule::bvColormapPath() const {
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index 5843cec267..6ee47f1d7a 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -429,7 +429,7 @@ void createExoplanetSystem(const std::string& starName) {
         "Renderable = {"
             "Type = 'RenderableRadialGrid',"
             "Enabled = " + isCircleEnabledString + ","
-            "OuterRadius = " + std::to_string(AU) + ","
+            "Radii = { 0.0, 1.0 },"
             "CircleSegments = 64,"
             "LineWidth = 2.0,"
         "},"
@@ -437,6 +437,10 @@ void createExoplanetSystem(const std::string& starName) {
             "Rotation = {"
                 "Type = 'StaticRotation',"
                 "Rotation = " + ghoul::to_string(meanOrbitPlaneRotationMatrix) + ""
+            "},"
+            "Scale = {"
+                "Type = 'StaticScale',"
+                "Scale = " + std::to_string(AU) + ""
             "}"
         "},"
         "GUI = {"
@@ -512,7 +516,7 @@ void createExoplanetSystem(const std::string& starName) {
             // the luminosity of a star is proportional to: (radius^2)*(temperature^4)
             // Maybe a better option would be to compute the size based on the aboslute
             // magnitude or star luminosity, but for now this looks good enough.
-            float size = 59.f * radiusInMeter;
+            double size = 59.0 * radiusInMeter;
             if (hasTeff) {
                 constexpr const float sunTeff = 5780.f;
                 size *= std::pow(system.starData.teff / sunTeff, 2.0);
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.cpp b/modules/exoplanets/rendering/renderableorbitdisc.cpp
index 7581788fac..8688d84e22 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.cpp
+++ b/modules/exoplanets/rendering/renderableorbitdisc.cpp
@@ -93,9 +93,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableOrbitDisc::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "exoplanets_renderableorbitdisc";
-    return doc;
+    return codegen::doc<Parameters>("exoplanets_renderableorbitdisc");
 }
 
 RenderableOrbitDisc::RenderableOrbitDisc(const ghoul::Dictionary& dictionary)
@@ -118,7 +116,7 @@ RenderableOrbitDisc::RenderableOrbitDisc(const ghoul::Dictionary& dictionary)
     setBoundingSphere(_size + _offset.value().y * _size);
 
     _texturePath = p.texture.string();
-    _texturePath.onChange([&]() { _texture->loadFromFile(_texturePath); });
+    _texturePath.onChange([&]() { _texture->loadFromFile(_texturePath.value()); });
     addProperty(_texturePath);
 
     _eccentricity = p.eccentricity;
@@ -148,7 +146,7 @@ void RenderableOrbitDisc::initializeGL() {
 
     ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
 
-    _texture->loadFromFile(_texturePath);
+    _texture->loadFromFile(_texturePath.value());
     _texture->uploadToGpu();
 
     _plane->initialize();
diff --git a/modules/exoplanets/shaders/orbitdisc_fs.glsl b/modules/exoplanets/shaders/orbitdisc_fs.glsl
index 0f56ee08a1..bab75b0556 100644
--- a/modules/exoplanets/shaders/orbitdisc_fs.glsl
+++ b/modules/exoplanets/shaders/orbitdisc_fs.glsl
@@ -22,11 +22,10 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include "PowerScaling/powerScaling_fs.hglsl"
 #include "fragment.glsl"
 
 in vec2 vs_st;
-in vec4 vs_position;
+in float vs_depth;
 
 uniform sampler1D discTexture;
 uniform vec2 offset; // relative to semi major axis
@@ -38,7 +37,7 @@ const float Epsilon = 0.0000001;
 
 // Compute semi minor axis from major axis, a, and eccentricity, e
 float semiMinorAxis(float a, float e) {
-    return a * sqrt(1.0 - e * e);
+  return a * sqrt(1.0 - e * e);
 }
 
 // If returned value <= 1, the point is insdie or on the ellipse specified by the input:
@@ -46,84 +45,84 @@ float semiMinorAxis(float a, float e) {
 // cx is the displacement of the center of the ellipse along the x-axis (for an orbit,
 // the y-displacement is always zero)
 float ellipseTest(vec2 point, float a, float b, float cx) {
-    float x = point.x;
-    float y = point.y;
-    return (pow(x - cx, 2.0) / (a*a)) + ((y*y) / (b*b));
+  float x = point.x;
+  float y = point.y;
+  return (pow(x - cx, 2.0) / (a*a)) + ((y*y) / (b*b));
 }
 
 Fragment getFragment() {
-    // Moving the origin to the center
-    vec2 st = (vs_st - vec2(0.5)) * 2.0;
+  // Moving the origin to the center
+  vec2 st = (vs_st - vec2(0.5)) * 2.0;
 
-    float offsetLower = offset.x * semiMajorAxis;
-    float offsetUpper = offset.y * semiMajorAxis;
+  float offsetLower = offset.x * semiMajorAxis;
+  float offsetUpper = offset.y * semiMajorAxis;
 
-    float AUpper = semiMajorAxis + offsetUpper;
-    float BUpper = semiMinorAxis(AUpper, eccentricity);
-    float CUpper = sqrt(AUpper*AUpper - BUpper*BUpper);
-    float outerApoapsisDistance = AUpper * (1 + eccentricity);
+  float AUpper = semiMajorAxis + offsetUpper;
+  float BUpper = semiMinorAxis(AUpper, eccentricity);
+  float CUpper = sqrt(AUpper*AUpper - BUpper*BUpper);
+  float outerApoapsisDistance = AUpper * (1.0 + eccentricity);
 
-    float ALower = semiMajorAxis - offsetLower;
-    float BLower = semiMinorAxis(ALower, eccentricity);
-    float CLower = sqrt(ALower*ALower - BLower*BLower);
-    float innerApoapsisDistance = ALower * (1 + eccentricity);
+  float ALower = semiMajorAxis - offsetLower;
+  float BLower = semiMinorAxis(ALower, eccentricity);
+  float CLower = sqrt(ALower*ALower - BLower*BLower);
+  float innerApoapsisDistance = ALower * (1.0 + eccentricity);
 
-    // Normalize based on outer apoapsis distance (size of plane)
-    float AU_n = AUpper / outerApoapsisDistance;
-    float BU_n = BUpper / outerApoapsisDistance;
-    float CU_n = CUpper / outerApoapsisDistance;
-    float AL_n = ALower / outerApoapsisDistance;
-    float BL_n = BLower / outerApoapsisDistance;
-    float CL_n = CLower / outerApoapsisDistance;
+  // Normalize based on outer apoapsis distance (size of plane)
+  float AU_n = AUpper / outerApoapsisDistance;
+  float BU_n = BUpper / outerApoapsisDistance;
+  float CU_n = CUpper / outerApoapsisDistance;
+  float AL_n = ALower / outerApoapsisDistance;
+  float BL_n = BLower / outerApoapsisDistance;
+  float CL_n = CLower / outerApoapsisDistance;
 
-    if (eccentricity <= Epsilon) {
-        CU_n = 0.0;
-        CL_n = 0.0;
-    }
+  if (eccentricity <= Epsilon) {
+    CU_n = 0.0;
+    CL_n = 0.0;
+  }
 
-    float outer = ellipseTest(st, AU_n, BU_n, -CU_n);
-    float inner = ellipseTest(st, AL_n, BL_n, -CL_n);
-    if (outer > 1.0 || inner < 1.0) {
-        // point is outside outer ellipse or inside inner eliipse
-        discard;
-    }
+  float outer = ellipseTest(st, AU_n, BU_n, -CU_n);
+  float inner = ellipseTest(st, AL_n, BL_n, -CL_n);
+  if (outer > 1.0 || inner < 1.0) {
+    // Point is outside outer ellipse or inside inner ellipse
+    discard;
+  }
 
-    // Remapping the texture coordinates
-    vec2 dir = normalize(st);
+  // Remapping the texture coordinates
+  vec2 dir = normalize(st);
 
-    // Find outer ellipse: where along the direction does the equation == 1?
-    float denominator = pow(BU_n * dir.x, 2.0) + pow(AU_n * dir.y, 2.0);
-    float first = -(BU_n * BU_n * dir.x * CU_n) / denominator;
-    float second = pow((BU_n * BU_n * dir.x * CU_n)  /  denominator, 2.0);
-    float third = (pow(BU_n * CU_n, 2.0) - pow(AU_n * BU_n, 2.0)) / denominator;
+  // Find outer ellipse: where along the direction does the equation == 1?
+  float denominator = pow(BU_n * dir.x, 2.0) + pow(AU_n * dir.y, 2.0);
+  float first = -(BU_n * BU_n * dir.x * CU_n) / denominator;
+  float second = pow((BU_n * BU_n * dir.x * CU_n)  /  denominator, 2.0);
+  float third = (pow(BU_n * CU_n, 2.0) - pow(AU_n * BU_n, 2.0)) / denominator;
 
-    float scale = first + sqrt(second - third);
+  float scale = first + sqrt(second - third);
 
-    vec2 outerPoint = dir * scale;
-    vec2 innerPoint = outerPoint * (innerApoapsisDistance / outerApoapsisDistance);
+  vec2 outerPoint = dir * scale;
+  vec2 innerPoint = outerPoint * (innerApoapsisDistance / outerApoapsisDistance);
 
-    float discWidth = distance(outerPoint, innerPoint);
-    float distanceFromOuterEdge = distance(outerPoint, st);
-    float relativeDistance = distanceFromOuterEdge / discWidth;
+  float discWidth = distance(outerPoint, innerPoint);
+  float distanceFromOuterEdge = distance(outerPoint, st);
+  float relativeDistance = distanceFromOuterEdge / discWidth;
 
-    // Compute texture coordinate based on the distance to outer edge
-    float textureCoord = 0.0;
+  // Compute texture coordinate based on the distance to outer edge
+  float textureCoord = 0.0;
 
-    // The midpoint (textureCoord = 0.5) depends on the ratio between the offsets
-    // (Note that the texture goes from outer to inner edge of disc)
-    float midPoint = offsetUpper / (offsetUpper + offsetLower);
-    if(relativeDistance > midPoint) {
-        textureCoord = 0.5 + 0.5 * (relativeDistance - midPoint) / (1.0 - midPoint);
-    }
-    else {
-        textureCoord = 0.5 * (relativeDistance / midPoint);
-    }
+  // The midpoint (textureCoord = 0.5) depends on the ratio between the offsets
+  // (Note that the texture goes from outer to inner edge of disc)
+  float midPoint = offsetUpper / (offsetUpper + offsetLower);
+  if (relativeDistance > midPoint) {
+    textureCoord = 0.5 + 0.5 * (relativeDistance - midPoint) / (1.0 - midPoint);
+  }
+  else {
+    textureCoord = 0.5 * (relativeDistance / midPoint);
+  }
 
-    vec4 diffuse = texture(discTexture, textureCoord);
-    diffuse.a *= opacity;
+  vec4 diffuse = texture(discTexture, textureCoord);
+  diffuse.a *= opacity;
 
-    Fragment frag;
-    frag.color = diffuse;
-    frag.depth = vs_position.w;
-    return frag;
+  Fragment frag;
+  frag.color = diffuse;
+  frag.depth = vs_depth;
+  return frag;
 }
diff --git a/modules/exoplanets/shaders/orbitdisc_vs.glsl b/modules/exoplanets/shaders/orbitdisc_vs.glsl
index 80a55c613d..37fda99a3f 100644
--- a/modules/exoplanets/shaders/orbitdisc_vs.glsl
+++ b/modules/exoplanets/shaders/orbitdisc_vs.glsl
@@ -30,15 +30,16 @@ layout(location = 0) in vec2 in_position;
 layout(location = 1) in vec2 in_st;
 
 out vec2 vs_st;
-out vec4 vs_position;
+out float vs_depth;
 
 uniform mat4 modelViewProjectionTransform;
 
 void main() {
-    vs_st = in_st;
-    vs_position = z_normalization(
-        modelViewProjectionTransform * vec4(in_position, 0.0, 1.0)
-    );
+  vs_st = in_st;
+  vec4 pos = z_normalization(
+    modelViewProjectionTransform * vec4(in_position, 0.0, 1.0)
+  );
 
-    gl_Position = vs_position;
+  vs_depth = pos.w;
+  gl_Position = pos;
 }
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index 837e9cafa3..d817b86285 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -34,39 +34,53 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <charconv>
+#include <filesystem>
 #include <fstream>
 
 namespace {
-    constexpr const char* KeyInputDataFile = "InputDataFile";
-    constexpr const char* KeyInputSpeck = "InputSPECK";
-    constexpr const char* KeyOutputBin = "OutputBIN";
-    constexpr const char* KeyOutputLut = "OutputLUT";
-    constexpr const char* KeyTeffToBv = "TeffToBvFile";
-
     constexpr const char* _loggerCat = "ExoplanetsDataPreparationTask";
+
+    struct [[codegen::Dictionary(ExoplanetsDataPreparationTask)]] Parameters {
+        // The csv file to extract data from
+        std::filesystem::path inputDataFile;
+
+        // The speck file with star locations
+        std::filesystem::path inputSPECK;
+
+        // The bin file to export data into
+        std::string outputBIN [[codegen::annotation("A valid filepath")]];
+
+        // The txt file to write look-up table into
+        std::string outputLUT [[codegen::annotation("A valid filepath")]];
+
+        // The path to a teff to bv conversion file. Should be a txt file where each line
+        // has the format 'teff,bv'
+        std::filesystem::path teffToBvFile;
+    };
+#include "exoplanetsdatapreparationtask_codegen.cpp"
 } // namespace
 
 namespace openspace::exoplanets {
 
+documentation::Documentation ExoplanetsDataPreparationTask::documentation() {
+    return codegen::doc<Parameters>("exoplanets_data_preparation_task");
+}
+
 ExoplanetsDataPreparationTask::ExoplanetsDataPreparationTask(
                                                       const ghoul::Dictionary& dictionary)
 {
-    openspace::documentation::testSpecificationAndThrow(
-        documentation(),
-        dictionary,
-        "ExoplanetsDataPreparationTask"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _inputDataPath = absPath(dictionary.value<std::string>(KeyInputDataFile));
-    _inputSpeckPath = absPath(dictionary.value<std::string>(KeyInputSpeck));
-    _outputBinPath = absPath(dictionary.value<std::string>(KeyOutputBin));
-    _outputLutPath = absPath(dictionary.value<std::string>(KeyOutputLut));
-    _teffToBvFilePath = absPath(dictionary.value<std::string>(KeyTeffToBv));
+    _inputDataPath = absPath(p.inputDataFile.string());
+    _inputSpeckPath = absPath(p.inputSPECK.string());
+    _outputBinPath = absPath(p.outputBIN);
+    _outputLutPath = absPath(p.outputLUT);
+    _teffToBvFilePath = absPath(p.teffToBvFile.string());
 }
 
 std::string ExoplanetsDataPreparationTask::description() {
     return fmt::format(
-        "Extract data about exoplanets from file '{}' and write as bin to '{}'. The data "
+        "Extract data about exoplanets from file {} and write as bin to {}. The data "
         "file should be a csv version of the Planetary Systems Composite Data from the "
         "NASA exoplanets archive (https://exoplanetarchive.ipac.caltech.edu/).",
         _inputDataPath, _outputBinPath
@@ -78,7 +92,7 @@ void ExoplanetsDataPreparationTask::perform(
 {
     std::ifstream inputDataFile(_inputDataPath);
     if (!inputDataFile.good()) {
-        LERROR(fmt::format("Failed to open input file '{}'", _inputDataPath));
+        LERROR(fmt::format("Failed to open input file {}", _inputDataPath));
         return;
     }
 
@@ -441,45 +455,4 @@ float ExoplanetsDataPreparationTask::bvFromTeff(float teff) {
     return bv;
 }
 
-documentation::Documentation ExoplanetsDataPreparationTask::documentation() {
-    using namespace documentation;
-    return {
-        "ExoplanetsDataPreparationTask",
-        "exoplanets_data_preparation_task",
-        {
-            {
-                KeyInputDataFile,
-                new FileVerifier,
-                Optional::No,
-                "The csv file to extract data from"
-            },
-            {
-                KeyInputSpeck,
-                new FileVerifier,
-                Optional::No,
-                "The speck file with star locations"
-            },
-            {
-                KeyOutputBin,
-                new StringAnnotationVerifier("A valid filepath"),
-                Optional::No,
-                "The bin file to export data into"
-            },
-            {
-                KeyOutputLut,
-                new StringAnnotationVerifier("A valid filepath"),
-                Optional::No,
-                "The txt file to write look-up table into"
-            },
-            {
-                KeyTeffToBv,
-                new FileVerifier,
-                Optional::No,
-                "The path to a teff to bv conversion file. Should be a txt file where "
-                "each line has the format 'teff,bv'"
-            }
-        }
-    };
-}
-
 } // namespace openspace::exoplanets
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
index ec3c7d823e..e5db06d53f 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
@@ -25,8 +25,10 @@
 #ifndef __OPENSPACE_MODULE_EXOPLANETS___EXOPLANETSDATAPREPARATIONTASK___H__
 #define __OPENSPACE_MODULE_EXOPLANETS___EXOPLANETSDATAPREPARATIONTASK___H__
 
-#include <openspace/properties/vector/vec3property.h>
 #include <openspace/util/task.h>
+
+#include <openspace/properties/vector/vec3property.h>
+#include <filesystem>
 #include <string>
 
 namespace openspace::exoplanets {
@@ -39,11 +41,11 @@ public:
     static documentation::Documentation documentation();
 
 private:
-    std::string _inputDataPath;
-    std::string _inputSpeckPath;
-    std::string _outputBinPath;
-    std::string _outputLutPath;
-    std::string _teffToBvFilePath;
+    std::filesystem::path _inputDataPath;
+    std::filesystem::path _inputSpeckPath;
+    std::filesystem::path _outputBinPath;
+    std::filesystem::path _outputLutPath;
+    std::filesystem::path _teffToBvFilePath;
 
     glm::vec3 starPosition(const std::string& starName);
 
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index e71c1e4bb3..d07530d03c 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -192,7 +192,7 @@ void RenderableFieldlines::initializeDefaultPropertyValues() {
                 std::string seedPointSourceFile = _seedPointsInfo.value<std::string>(
                     KeySeedPointsFile
                 );
-                _seedPointSourceFile = absPath(seedPointSourceFile);
+                _seedPointSourceFile = absPath(seedPointSourceFile).string();
             }
         }
         else if (sourceType == SeedPointsSourceTable) {
@@ -435,7 +435,7 @@ RenderableFieldlines::generateFieldlinesVolumeKameleon()
         return {};
     }
     std::string fileName = _vectorFieldInfo.value<std::string>(KeyVectorFieldFile);
-    fileName = absPath(fileName);
+    fileName = absPath(fileName).string();
 
     //KameleonWrapper::Model modelType;
     if (model != VectorFieldKameleonModelBATSRUS) {
diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.cpp b/modules/fieldlinessequence/fieldlinessequencemodule.cpp
index 35959eb514..9335c9cf8d 100644
--- a/modules/fieldlinessequence/fieldlinessequencemodule.cpp
+++ b/modules/fieldlinessequence/fieldlinessequencemodule.cpp
@@ -50,7 +50,9 @@ namespace openspace {
 std::string FieldlinesSequenceModule::DefaultTransferFunctionFile = "";
 
 FieldlinesSequenceModule::FieldlinesSequenceModule() : OpenSpaceModule(Name) {
-    DefaultTransferFunctionFile = absPath("${TEMPORARY}/default_transfer_function.txt");
+    DefaultTransferFunctionFile = absPath(
+        "${TEMPORARY}/default_transfer_function.txt"
+    ).string();
 
     std::ofstream file(DefaultTransferFunctionFile);
     file << DefaultTransferfunctionSource;
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index b500fe33c6..95e075a9a6 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -38,6 +38,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/textureunit.h>
+#include <filesystem>
 #include <fstream>
 #include <thread>
 
@@ -294,7 +295,9 @@ void RenderableFieldlinesSequence::initializeGL() {
     // Set a default color table, just in case the (optional) user defined paths are
     // corrupt or not provided!
     _colorTablePaths.push_back(FieldlinesSequenceModule::DefaultTransferFunctionFile);
-    _transferFunction = std::make_unique<TransferFunction>(absPath(_colorTablePaths[0]));
+    _transferFunction = std::make_unique<TransferFunction>(
+        absPath(_colorTablePaths[0]).string()
+    );
 
     // EXTRACT OPTIONAL INFORMATION FROM DICTIONARY
     std::string outputFolderPath;
@@ -417,13 +420,16 @@ bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
 
     // Ensure that the source folder exists and then extract
     // the files with the same extension as <inputFileTypeString>
-    ghoul::filesystem::Directory sourceFolder(sourceFolderPath);
-    if (FileSys.directoryExists(sourceFolder)) {
+    if (std::filesystem::is_directory(sourceFolderPath)) {
         // Extract all file paths from the provided folder
-        _sourceFiles = sourceFolder.readFiles(
-            ghoul::filesystem::Directory::Recursive::No,
-            ghoul::filesystem::Directory::Sort::Yes
-        );
+        _sourceFiles.clear();
+        namespace fs = std::filesystem;
+        for (const fs::directory_entry& e : fs::directory_iterator(sourceFolderPath)) {
+            if (e.is_regular_file()) {
+                _sourceFiles.push_back(e.path().string());
+            }
+        }
+        std::sort(_sourceFiles.begin(), _sourceFiles.end());
 
         // Remove all files that don't have <inputFileTypeString> as extension
         _sourceFiles.erase(
@@ -471,9 +477,8 @@ void RenderableFieldlinesSequence::extractOptionalInfoFromDictionary(
     // ------------------- EXTRACT OPTIONAL VALUES FROM DICTIONARY ------------------- //
     if (_dictionary->hasValue<std::string>(KeyOutputFolder)) {
         outputFolderPath = _dictionary->value<std::string>(KeyOutputFolder);
-        ghoul::filesystem::Directory outputFolder(outputFolderPath);
-        if (FileSys.directoryExists(outputFolder)) {
-            outputFolderPath = absPath(outputFolderPath);
+        if (std::filesystem::is_directory(outputFolderPath)) {
+            outputFolderPath = absPath(outputFolderPath).string();
         }
         else {
             LERROR(fmt::format(
@@ -605,8 +610,9 @@ void RenderableFieldlinesSequence::loadOsflsStatesIntoRAM(const std::string& out
         if (newState.loadStateFromOsfls(filePath)) {
             addStateToSequence(newState);
             if (!outputFolder.empty()) {
-                ghoul::filesystem::File tmpFile(filePath);
-                newState.saveStateToJson(outputFolder + tmpFile.baseName());
+                newState.saveStateToJson(
+                    outputFolder + std::filesystem::path(filePath).stem().string()
+                );
             }
         }
         else {
@@ -916,9 +922,8 @@ bool RenderableFieldlinesSequence::extractCdfInfoFromDictionary(std::string& see
 {
     if (_dictionary->hasValue<std::string>(KeyCdfSeedPointFile)) {
         seedFilePath = _dictionary->value<std::string>(KeyCdfSeedPointFile);
-        ghoul::filesystem::File seedPointFile(seedFilePath);
-        if (FileSys.fileExists(seedPointFile)) {
-            seedFilePath = absPath(seedFilePath);
+        if (std::filesystem::is_regular_file(seedFilePath)) {
+            seedFilePath = absPath(seedFilePath).string();
         }
         else {
             LERROR(fmt::format(
@@ -962,7 +967,7 @@ bool RenderableFieldlinesSequence::extractSeedPointsFromFile(const std::string&
                                                            std::vector<glm::vec3>& outVec)
 {
 
-    std::ifstream seedFile(FileSys.relativePath(path));
+    std::ifstream seedFile(path);
     if (!seedFile.good()) {
         LERROR(fmt::format("Could not open seed points file '{}'", path));
         return false;
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index e89dc71d06..2971318b53 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -414,9 +414,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableGaiaStars::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "gaiamission_renderablegaiastars";
-    return doc;
+    return codegen::doc<Parameters>("gaiamission_renderablegaiastars");
 }
 
 RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
@@ -462,11 +460,11 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
 
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _filePath = absPath(p.file);
-    _dataFile = std::make_unique<File>(_filePath);
-    _dataFile->setCallback([&](const File&) { _dataIsDirty = true; });
+    _filePath = absPath(p.file).string();
+    _dataFile = std::make_unique<File>(_filePath.value());
+    _dataFile->setCallback([this]() { _dataIsDirty = true; });
 
-    _filePath.onChange([&]() { _dataIsDirty = true; });
+    _filePath.onChange([this]() { _dataIsDirty = true; });
     addProperty(_filePath);
 
     _fileReaderOption.addOptions({
@@ -519,7 +517,6 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
     _renderOption.onChange([&]() { _buffersAreDirty = true; });
     addProperty(_renderOption);
 
-#ifndef __APPLE__
     _shaderOption.addOptions({
         { gaia::ShaderOption::Point_SSBO, "Point_SSBO" },
         { gaia::ShaderOption::Point_VBO, "Point_VBO" },
@@ -527,35 +524,35 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
         { gaia::ShaderOption::Billboard_VBO, "Billboard_VBO" },
         { gaia::ShaderOption::Billboard_SSBO_noFBO, "Billboard_SSBO_noFBO" }
     });
-#else // __APPLE__
-    _shaderOption.addOptions({
-        { gaia::ShaderOption::Point_VBO, "Point_VBO" },
-        { gaia::ShaderOption::Billboard_VBO, "Billboard_VBO" },
-    });
-#endif // __APPLE__
 
     if (p.shaderOption.has_value()) {
         switch (*p.shaderOption) {
             case Parameters::ShaderOption::PointSSBO:
                 _shaderOption = gaia::ShaderOption::Point_SSBO;
+#ifdef __APPLE__
+                LWARNING("Shader option unsupported, changing to Point VBO");
+                _shaderOption = gaia::ShaderOption::Point_VBO;
+#endif // __APPLE__
                 break;
             case Parameters::ShaderOption::PointVBO:
-#ifdef __APPLE__
-                throw ghoul::RuntimeError("Shader option is not supported on MacOS");
-#endif // __APPLE__
                 _shaderOption = gaia::ShaderOption::Point_VBO;
                 break;
             case Parameters::ShaderOption::BillboardSSBO:
                 _shaderOption = gaia::ShaderOption::Billboard_SSBO;
+#ifdef __APPLE__
+                LWARNING("Shader option unsupported, changing to Point VBO");
+                _shaderOption = gaia::ShaderOption::Point_VBO;
+#endif // __APPLE__
                 break;
             case Parameters::ShaderOption::BillboardVBO:
-#ifdef __APPLE__
-                throw ghoul::RuntimeError("Shader option is not supported on MacOS");
-#endif // __APPLE__
                 _shaderOption = gaia::ShaderOption::Billboard_VBO;
                 break;
             case Parameters::ShaderOption::BillboardSSBONoFBO:
                 _shaderOption = gaia::ShaderOption::Billboard_SSBO_noFBO;
+#ifdef __APPLE__
+                LWARNING("Shader option unsupported, changing to Point VBO");
+                _shaderOption = gaia::ShaderOption::Point_VBO;
+#endif // __APPLE__
                 break;
             default:
                 throw ghoul::MissingCaseException();
@@ -567,19 +564,21 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
     });
     addProperty(_shaderOption);
 
-    _pointSpreadFunctionTexturePath = absPath(p.texture);
+    _pointSpreadFunctionTexturePath = absPath(p.texture).string();
     _pointSpreadFunctionTexturePath.onChange(
-        [&](){ _pointSpreadFunctionTextureIsDirty = true; }
+        [this](){ _pointSpreadFunctionTextureIsDirty = true; }
+    );
+    _pointSpreadFunctionFile = std::make_unique<File>(
+        _pointSpreadFunctionTexturePath.value()
     );
-    _pointSpreadFunctionFile = std::make_unique<File>(_pointSpreadFunctionTexturePath);
     _pointSpreadFunctionFile->setCallback(
-        [&](const File&) { _pointSpreadFunctionTextureIsDirty = true; }
+        [this]() { _pointSpreadFunctionTextureIsDirty = true; }
     );
 
-    _colorTexturePath = absPath(p.colorMap);
-    _colorTextureFile = std::make_unique<File>(_colorTexturePath);
-    _colorTexturePath.onChange([&]() { _colorTextureIsDirty = true; });
-    _colorTextureFile->setCallback([&](const File&) { _colorTextureIsDirty = true; });
+    _colorTexturePath = absPath(p.colorMap).string();
+    _colorTextureFile = std::make_unique<File>(_colorTexturePath.value());
+    _colorTexturePath.onChange([this]() { _colorTextureIsDirty = true; });
+    _colorTextureFile->setCallback([this]() { _colorTextureIsDirty = true; });
 
     _luminosityMultiplier = p.luminosityMultiplier.value_or(_luminosityMultiplier);
     _magnitudeBoost = p.magnitudeBoost.value_or(_magnitudeBoost);
@@ -1701,10 +1700,10 @@ void RenderableGaiaStars::update(const UpdateData&) {
             }
             case gaia::ShaderOption::Billboard_SSBO:
             case gaia::ShaderOption::Billboard_VBO: {
-                std::string vs = absPath(
+                std::filesystem::path vs = absPath(
                     "${MODULE_GAIA}/shaders/gaia_tonemapping_vs.glsl"
                 );
-                std::string fs = absPath(
+                std::filesystem::path fs = absPath(
                     "${MODULE_GAIA}/shaders/gaia_tonemapping_billboard_fs.glsl"
                 );
                 std::unique_ptr<ghoul::opengl::ProgramObject> programTM =
@@ -2101,12 +2100,12 @@ void RenderableGaiaStars::update(const UpdateData&) {
         _pointSpreadFunctionTexture = nullptr;
         if (!_pointSpreadFunctionTexturePath.value().empty()) {
             _pointSpreadFunctionTexture = ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_pointSpreadFunctionTexturePath)
+                absPath(_pointSpreadFunctionTexturePath).string()
             );
 
             if (_pointSpreadFunctionTexture) {
                 LDEBUG(fmt::format(
-                    "Loaded texture from '{}'", absPath(_pointSpreadFunctionTexturePath)
+                    "Loaded texture from {}", absPath(_pointSpreadFunctionTexturePath)
                ));
                 _pointSpreadFunctionTexture->uploadTexture();
             }
@@ -2115,12 +2114,10 @@ void RenderableGaiaStars::update(const UpdateData&) {
             );
 
             _pointSpreadFunctionFile = std::make_unique<ghoul::filesystem::File>(
-                _pointSpreadFunctionTexturePath
+                _pointSpreadFunctionTexturePath.value()
             );
             _pointSpreadFunctionFile->setCallback(
-                [&](const ghoul::filesystem::File&) {
-                    _pointSpreadFunctionTextureIsDirty = true;
-                }
+                [this]() { _pointSpreadFunctionTextureIsDirty = true; }
             );
         }
         _pointSpreadFunctionTextureIsDirty = false;
@@ -2131,7 +2128,7 @@ void RenderableGaiaStars::update(const UpdateData&) {
         _colorTexture = nullptr;
         if (!_colorTexturePath.value().empty()) {
             _colorTexture = ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_colorTexturePath)
+                absPath(_colorTexturePath).string()
             );
             if (_colorTexture) {
                 LDEBUG(fmt::format(
@@ -2141,11 +2138,9 @@ void RenderableGaiaStars::update(const UpdateData&) {
             }
 
             _colorTextureFile = std::make_unique<ghoul::filesystem::File>(
-                _colorTexturePath
-            );
-            _colorTextureFile->setCallback(
-                [&](const ghoul::filesystem::File&) { _colorTextureIsDirty = true; }
+                _colorTexturePath.value()
             );
+            _colorTextureFile->setCallback([this]() { _colorTextureIsDirty = true; });
         }
         _colorTextureIsDirty = false;
     }
diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp
index 7fefa17517..1239a65960 100644
--- a/modules/gaia/tasks/constructoctreetask.cpp
+++ b/modules/gaia/tasks/constructoctreetask.cpp
@@ -28,9 +28,9 @@
 #include <openspace/documentation/verifier.h>
 #include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/filesystem/directory.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
+#include <filesystem>
 #include <fstream>
 #include <thread>
 
@@ -295,8 +295,10 @@ ConstructOctreeTask::ConstructOctreeTask(const ghoul::Dictionary& dictionary) {
 }
 
 std::string ConstructOctreeTask::description() {
-    return "Read bin file (or files in folder): " + _inFileOrFolderPath + "\n "
-        "and write octree data file (or files) into: " + _outFileOrFolderPath + "\n";
+    return fmt::format(
+        "Read bin file (or files in folder): {} and write octree data file (or files) "
+        "into: {}", _inFileOrFolderPath, _outFileOrFolderPath
+    );
 }
 
 void ConstructOctreeTask::perform(const Task::ProgressCallback& onProgress) {
@@ -323,7 +325,7 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
 
     _octreeManager->initOctree(0, _maxDist, _maxStarsPerNode);
 
-    LINFO("Reading data file: " + _inFileOrFolderPath);
+    LINFO(fmt::format("Reading data file: {}", _inFileOrFolderPath));
 
     LINFO(fmt::format(
         "MAX DIST: {} - MAX STARS PER NODE: {}",
@@ -404,8 +406,7 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
     }
     else {
         LERROR(fmt::format(
-            "Error opening file '{}' for loading preprocessed file!",
-            _inFileOrFolderPath
+            "Error opening file {} for loading preprocessed file", _inFileOrFolderPath
         ));
     }
     LINFO(fmt::format("{} of {} read stars were filtered", nFilteredStars, nTotalStars));
@@ -413,7 +414,7 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
     // Slice LOD data before writing to files.
     _octreeManager->sliceLodData();
 
-    LINFO("Writing octree to: " + _outFileOrFolderPath);
+    LINFO(fmt::format("Writing octree to: {}", _outFileOrFolderPath));
     std::ofstream outFileStream(_outFileOrFolderPath, std::ofstream::binary);
     if (outFileStream.good()) {
         if (nValues == 0) {
@@ -425,7 +426,7 @@ void ConstructOctreeTask::constructOctreeFromSingleFile(
     }
     else {
         LERROR(fmt::format(
-            "Error opening file: {} as output data file.", _outFileOrFolderPath
+            "Error opening file: {} as output data file", _outFileOrFolderPath
         ));
     }
 }
@@ -452,8 +453,16 @@ void ConstructOctreeTask::constructOctreeFromFolder(
     //int starsOutside2000 = 0;
     //int starsOutside5000 = 0;
 
-    ghoul::filesystem::Directory currentDir(_inFileOrFolderPath);
-    std::vector<std::string> allInputFiles = currentDir.readFiles();
+    std::vector<std::filesystem::path> allInputFiles;
+    if (std::filesystem::is_directory(_inFileOrFolderPath)) {
+        namespace fs = std::filesystem;
+        for (const fs::directory_entry& e : fs::directory_iterator(_inFileOrFolderPath)) {
+            if (!e.is_regular_file()) {
+                allInputFiles.push_back(e.path());
+            }
+        }
+    }
+    
     std::vector<float> filterValues;
     auto writeThreads = std::vector<std::thread>(8);
 
@@ -467,10 +476,10 @@ void ConstructOctreeTask::constructOctreeFromFolder(
     ));
 
     for (size_t idx = 0; idx < allInputFiles.size(); ++idx) {
-        std::string inFilePath = allInputFiles[idx];
+        std::filesystem::path inFilePath = allInputFiles[idx];
         int nStarsInfile = 0;
 
-        LINFO("Reading data file: " + inFilePath);
+        LINFO(fmt::format("Reading data file: {}", inFilePath));
 
         std::ifstream inFileStream(inFilePath, std::ifstream::binary);
         if (inFileStream.good()) {
@@ -528,7 +537,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
         }
         else {
             LERROR(fmt::format(
-                "Error opening file '{}' for loading preprocessed file!", inFilePath
+                "Error opening file {} for loading preprocessed file!", inFilePath
             ));
         }
 
@@ -552,7 +561,7 @@ void ConstructOctreeTask::constructOctreeFromFolder(
         std::thread t(
             &OctreeManager::writeToMultipleFiles,
             _indexOctreeManager,
-            _outFileOrFolderPath,
+            _outFileOrFolderPath.string(),
             idx
         );
         writeThreads[idx] = std::move(t);
@@ -582,17 +591,19 @@ void ConstructOctreeTask::constructOctreeFromFolder(
     //    " - 5000kPc is " + std::to_string(starsOutside5000));
 
     // Write index file of Octree structure.
-    std::string indexFileOutPath = _outFileOrFolderPath + "index.bin";
+    std::filesystem::path indexFileOutPath = fmt::format(
+        "{}/index.bin", _outFileOrFolderPath.string()
+    );
     std::ofstream outFileStream(indexFileOutPath, std::ofstream::binary);
     if (outFileStream.good()) {
-        LINFO("Writing index file!");
+        LINFO("Writing index file");
         _indexOctreeManager->writeToFile(outFileStream, false);
 
         outFileStream.close();
     }
     else {
         LERROR(fmt::format(
-            "Error opening file: {} as index output file.", indexFileOutPath
+            "Error opening file: {} as index output file", indexFileOutPath
         ));
     }
 
@@ -642,9 +653,7 @@ bool ConstructOctreeTask::filterStar(const glm::vec2& range, float filterValue,
 }
 
 documentation::Documentation ConstructOctreeTask::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "gaiamission_constructoctreefrombin";
-    return doc;
+    return codegen::doc<Parameters>("gaiamission_constructoctreefrombin");
 }
 
 } // namespace openspace
diff --git a/modules/gaia/tasks/constructoctreetask.h b/modules/gaia/tasks/constructoctreetask.h
index e4be13457d..75701fd2a2 100644
--- a/modules/gaia/tasks/constructoctreetask.h
+++ b/modules/gaia/tasks/constructoctreetask.h
@@ -29,6 +29,7 @@
 
 #include <modules/gaia/rendering/octreeculler.h>
 #include <modules/gaia/rendering/octreemanager.h>
+#include <filesystem>
 
 namespace openspace {
 
@@ -78,8 +79,8 @@ private:
      */
     bool filterStar(const glm::vec2& range, float filterValue, float normValue = 0.f);
 
-    std::string _inFileOrFolderPath;
-    std::string _outFileOrFolderPath;
+    std::filesystem::path _inFileOrFolderPath;
+    std::filesystem::path _outFileOrFolderPath;
     int _maxDist = 0;
     int _maxStarsPerNode = 0;
     bool _singleFileInput = false;
diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp
index 865433da6a..a23d128073 100644
--- a/modules/gaia/tasks/readfitstask.cpp
+++ b/modules/gaia/tasks/readfitstask.cpp
@@ -30,10 +30,9 @@
 
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/filesystem/directory.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/fmt.h>
-
+#include <filesystem>
 #include <fstream>
 #include <set>
 #include <optional>
@@ -132,7 +131,7 @@ void ReadFitsTask::readSingleFitsFile(const Task::ProgressCallback& progressCall
 
     FitsFileReader fileReader(false);
     std::vector<float> fullData = fileReader.readFitsFile(
-        _inFileOrFolderPath,
+        _inFileOrFolderPath.string(),
         nValuesPerStar,
         _firstRow,
         _lastRow,
@@ -166,7 +165,7 @@ void ReadFitsTask::readSingleFitsFile(const Task::ProgressCallback& progressCall
     }
     else {
         LERROR(fmt::format(
-            "Error opening file: {} as output data file.", _outFileOrFolderPath
+            "Error opening file: {} as output data file", _outFileOrFolderPath
         ));
     }
 }
@@ -185,8 +184,16 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
     ConcurrentJobManager<std::vector<std::vector<float>>> jobManager(threadPool);
 
     // Get all files in specified folder.
-    ghoul::filesystem::Directory currentDir(_inFileOrFolderPath);
-    std::vector<std::string> allInputFiles = currentDir.readFiles();
+    std::vector<std::filesystem::path> allInputFiles;
+    if (std::filesystem::is_directory(_inFileOrFolderPath)) {
+        namespace fs = std::filesystem;
+        for (const fs::directory_entry& e : fs::directory_iterator(_inFileOrFolderPath)) {
+            if (e.is_regular_file()) {
+                allInputFiles.push_back(e.path());
+            }
+        }
+    }
+    
     size_t nInputFiles = allInputFiles.size();
     LINFO("Files to read: " + std::to_string(nInputFiles));
 
@@ -238,12 +245,12 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
 
     // Divide all files into ReadFilejobs and then delegate them onto several threads!
     while (!allInputFiles.empty()) {
-        std::string fileToRead = allInputFiles.back();
+        std::filesystem::path fileToRead = allInputFiles.back();
         allInputFiles.erase(allInputFiles.end() - 1);
 
         // Add reading of file to jobmanager, which will distribute it to our threadpool.
         auto readFileJob = std::make_shared<gaia::ReadFileJob>(
-            fileToRead,
+            fileToRead.string(),
             _allColumnNames,
             _firstRow,
             _lastRow,
@@ -294,7 +301,9 @@ void ReadFitsTask::readAllFitsFilesFromFolder(const Task::ProgressCallback&) {
 int ReadFitsTask::writeOctantToFile(const std::vector<float>& octantData, int index,
                                     std::vector<bool>& isFirstWrite, int nValuesPerStar)
 {
-    std::string outPath = fmt::format("{}octant_{}.bin", _outFileOrFolderPath, index);
+    std::string outPath = fmt::format(
+        "{}octant_{}.bin", _outFileOrFolderPath.string(), index
+    );
     std::ofstream fileStream(outPath, std::ofstream::binary | std::ofstream::app);
     if (fileStream.good()) {
         int32_t nValues = static_cast<int32_t>(octantData.size());
@@ -328,9 +337,7 @@ int ReadFitsTask::writeOctantToFile(const std::vector<float>& octantData, int in
 }
 
 documentation::Documentation ReadFitsTask::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "gaiamission_fitsfiletorawdata";
-    return doc;
+    return codegen::doc<Parameters>("gaiamission_fitsfiletorawdata");
 }
 
 } // namespace openspace
diff --git a/modules/gaia/tasks/readfitstask.h b/modules/gaia/tasks/readfitstask.h
index ee965cc71c..82568057a1 100644
--- a/modules/gaia/tasks/readfitstask.h
+++ b/modules/gaia/tasks/readfitstask.h
@@ -26,9 +26,11 @@
 #define __OPENSPACE_MODULE_GAIA___READFITSTASK___H__
 
 #include <openspace/util/task.h>
+
 #include <openspace/util/threadpool.h>
 #include <openspace/util/concurrentjobmanager.h>
 #include <modules/fitsfilereader/include/fitsfilereader.h>
+#include <filesystem>
 
 namespace openspace {
 
@@ -67,8 +69,8 @@ private:
     int writeOctantToFile(const std::vector<float>& data, int index,
         std::vector<bool>& isFirstWrite, int nValuesPerStar);
 
-    std::string _inFileOrFolderPath;
-    std::string _outFileOrFolderPath;
+    std::filesystem::path _inFileOrFolderPath;
+    std::filesystem::path _outFileOrFolderPath;
     bool _singleFileProcess = false;
     size_t _threadsToUse = 1;
     int _firstRow = 0;
diff --git a/modules/gaia/tasks/readspecktask.cpp b/modules/gaia/tasks/readspecktask.cpp
index 04526a33d9..7a0b45917e 100644
--- a/modules/gaia/tasks/readspecktask.cpp
+++ b/modules/gaia/tasks/readspecktask.cpp
@@ -49,9 +49,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation ReadSpeckTask::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "gaiamission_speckfiletorawdata";
-    return doc;
+    return codegen::doc<Parameters>("gaiamission_speckfiletorawdata");
 }
 
 ReadSpeckTask::ReadSpeckTask(const ghoul::Dictionary& dictionary) {
@@ -72,7 +70,10 @@ void ReadSpeckTask::perform(const Task::ProgressCallback& onProgress) {
     int32_t nRenderValues = 0;
 
     FitsFileReader fileReader(false);
-    std::vector<float> fullData = fileReader.readSpeckFile(_inFilePath, nRenderValues);
+    std::vector<float> fullData = fileReader.readSpeckFile(
+        _inFilePath.string(),
+        nRenderValues
+    );
 
     onProgress(0.9f);
 
diff --git a/modules/gaia/tasks/readspecktask.h b/modules/gaia/tasks/readspecktask.h
index f42b07a81f..ce1a1bb446 100644
--- a/modules/gaia/tasks/readspecktask.h
+++ b/modules/gaia/tasks/readspecktask.h
@@ -27,6 +27,7 @@
 
 #include <openspace/util/task.h>
 
+#include <filesystem>
 #include <string>
 
 namespace openspace {
@@ -43,8 +44,8 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    std::string _inFilePath;
-    std::string _outFilePath;
+    std::filesystem::path _inFilePath;
+    std::filesystem::path _outFilePath;
 };
 
 } // namespace openspace
diff --git a/modules/galaxy/rendering/galaxyraycaster.cpp b/modules/galaxy/rendering/galaxyraycaster.cpp
index 0f11505f9d..a861503af6 100644
--- a/modules/galaxy/rendering/galaxyraycaster.cpp
+++ b/modules/galaxy/rendering/galaxyraycaster.cpp
@@ -58,7 +58,7 @@ void GalaxyRaycaster::initialize() {
 void GalaxyRaycaster::renderEntryPoints(const RenderData& data,
                                         ghoul::opengl::ProgramObject& program)
 {
-    program.setUniform("modelViewTransform", glm::mat4(modelViewTransform(data)));
+    program.setUniform("modelViewTransform", modelViewTransform(data));
     program.setUniform("projectionTransform", data.camera.projectionMatrix());
 
     // Cull back face
@@ -73,7 +73,7 @@ void GalaxyRaycaster::renderExitPoints(const RenderData& data,
                                        ghoul::opengl::ProgramObject& program)
 {
     // Uniforms
-    program.setUniform("modelViewTransform", glm::mat4(modelViewTransform(data)));
+    program.setUniform("modelViewTransform", modelViewTransform(data));
     program.setUniform("projectionTransform", data.camera.projectionMatrix());
 
     // Cull front face
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 5964eff426..6cb9da54ee 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -27,6 +27,7 @@
 #include <modules/galaxy/rendering/galaxyraycaster.h>
 #include <modules/volume/rawvolume.h>
 #include <modules/volume/rawvolumereader.h>
+#include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/raycastermanager.h>
 #include <openspace/rendering/renderable.h>
@@ -47,7 +48,9 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <glm/gtc/matrix_transform.hpp>
+#include <filesystem>
 #include <fstream>
+#include <optional>
 
 namespace {
     constexpr int8_t CurrentCacheVersion = 1;
@@ -55,12 +58,12 @@ namespace {
     constexpr const char* _loggerCat = "Renderable Galaxy";
 
     constexpr const std::array<const char*, 4> UniformNamesPoints = {
-        "modelMatrix", "cameraViewProjectionMatrix", "eyePosition",
+        "modelMatrix", "viewProjectionMatrix", "eyePosition",
         "opacityCoefficient"
     };
 
     constexpr const std::array<const char*, 5> UniformNamesBillboards = {
-        "modelMatrix", "cameraViewProjectionMatrix",
+        "modelMatrix", "viewProjectionMatrix",
         "cameraUp", "eyePosition", "psfTexture"
     };
 
@@ -94,12 +97,6 @@ namespace {
         "" // @TODO Missing documentation
     };
 
-    constexpr openspace::properties::Property::PropertyInfo TranslationInfo = {
-        "Translation",
-        "Translation",
-        "" // @TODO Missing documentation
-    };
-
     constexpr openspace::properties::Property::PropertyInfo RotationInfo = {
         "Rotation",
         "Euler rotation",
@@ -134,6 +131,57 @@ namespace {
         "This value set the number of integration steps during the raycasting procedure."
     };
 
+    struct [[codegen::Dictionary(RenderableGalaxy)]] Parameters {
+        // [[codegen::verbatim(VolumeRenderingEnabledInfo.description)]]
+        std::optional<bool> volumeRenderingEnabled;
+
+        // [[codegen::verbatim(StarRenderingEnabledInfo.description)]]
+        std::optional<bool> starRenderingEnabled;
+
+        // [[codegen::verbatim(StepSizeInfo.description)]]
+        std::optional<float> stepSizeInfo;
+
+        // [[codegen::verbatim(AbsorptionMultiplyInfo.description)]]
+        std::optional<float> absorptionMultiply;
+
+        // [[codegen::verbatim(EmissionMultiplyInfo.description)]]
+        std::optional<float> emissionMultiply;
+
+        enum class StarRenderingMethod {
+            Points,
+            Billboards
+        };
+        // [[codegen::verbatim(StarRenderingMethodInfo.description)]]
+        std::optional<StarRenderingMethod> starRenderingMethod;
+
+        // [[codegen::verbatim(RotationInfo.description)]]
+        std::optional<glm::vec3> rotation;
+
+        struct Volume {
+            std::filesystem::path filename;
+            glm::ivec3 dimensions;
+            glm::vec3 size;
+
+            // [[codegen::verbatim(NumberOfRayCastingStepsInfo.description)]]
+            std::optional<float> steps;
+
+            // [[codegen::verbatim(DownscaleVolumeRenderingInfo.description)]]
+            std::optional<float> downscale;
+        };
+        Volume volume;
+
+        struct Points {
+            std::filesystem::path filename;
+            std::filesystem::path texture;
+
+            // [[codegen::verbatim(EnabledPointsRatioInfo.description)]]
+            std::optional<float> enabledPointsRatio;
+        };
+        Points points;
+    };
+#include "renderablegalaxy_codegen.cpp"
+
+
     void saveCachedFile(const std::string& file, const std::vector<glm::vec3>& positions,
                         const std::vector<glm::vec3>& colors, int64_t nPoints,
                         float pointsRatio)
@@ -165,6 +213,12 @@ namespace {
         );
     }
 
+    float safeLength(const glm::vec3& vector) {
+        const float maxComponent = std::max(
+            std::max(std::abs(vector.x), std::abs(vector.y)), std::abs(vector.z)
+        );
+        return glm::length(vector / maxComponent) * maxComponent;
+    }
 } // namespace
 
 namespace openspace {
@@ -173,7 +227,7 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _volumeRenderingEnabled(VolumeRenderingEnabledInfo, true)
     , _starRenderingEnabled(StarRenderingEnabledInfo, true)
-    , _stepSize(StepSizeInfo, 0.01f, 0.0005f, 0.05f, 0.001f)
+    , _stepSize(StepSizeInfo, 0.01f, 0.001f, 0.05f, 0.001f)
     , _absorptionMultiply(AbsorptionMultiplyInfo, 40.f, 0.0f, 200.0f)
     , _emissionMultiply(EmissionMultiplyInfo, 200.f, 0.0f, 1000.0f)
     , _starRenderingMethod(
@@ -181,7 +235,6 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
         properties::OptionProperty::DisplayType::Dropdown
     )
     , _enabledPointsRatio(EnabledPointsRatioInfo, 0.5f, 0.01f, 1.0f)
-    , _translation(TranslationInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
     , _rotation(
         RotationInfo,
         glm::vec3(0.f),
@@ -191,138 +244,44 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
     , _downScaleVolumeRendering(DownscaleVolumeRenderingInfo, 1.f, 0.1f, 1.f)
     , _numberOfRayCastingSteps(NumberOfRayCastingStepsInfo, 1000.f, 1.f, 1000.f)
 {
-    if (dictionary.hasKey("VolumeRenderingEnabled")) {
-        _volumeRenderingEnabled = dictionary.value<bool>("VolumeRenderingEnabled");
-    }
-    if (dictionary.hasKey("StarRenderingEnabled")) {
-        _starRenderingEnabled = dictionary.value<bool>("StarRenderingEnabled");
-    }
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    if (dictionary.hasKey("StarRenderingMethod")) {
-        _starRenderingMethod = dictionary.value<int>("StarRenderingMethod");
-    }
-
-    if (dictionary.hasValue<bool>(VolumeRenderingEnabledInfo.identifier)) {
-        _volumeRenderingEnabled = dictionary.value<bool>(
-            VolumeRenderingEnabledInfo.identifier
-        );
-    }
-
-    if (dictionary.hasValue<bool>(StarRenderingEnabledInfo.identifier)) {
-        _starRenderingEnabled = static_cast<bool>(StarRenderingEnabledInfo.identifier);
-    }
-
-    if (dictionary.hasValue<double>(StepSizeInfo.identifier)) {
-        _stepSize = static_cast<float>(dictionary.value<double>(StepSizeInfo.identifier));
-    }
-
-    if (dictionary.hasValue<double>(AbsorptionMultiplyInfo.identifier)) {
-        _absorptionMultiply = static_cast<float>(
-            dictionary.value<double>(AbsorptionMultiplyInfo.identifier)
-        );
-    }
-
-    if (dictionary.hasValue<double>(EmissionMultiplyInfo.identifier)) {
-        _emissionMultiply = static_cast<float>(
-            dictionary.value<double>(EmissionMultiplyInfo.identifier)
-        );
-    }
+    _volumeRenderingEnabled = p.volumeRenderingEnabled.value_or(_volumeRenderingEnabled);
+    _starRenderingEnabled = p.starRenderingEnabled.value_or(_starRenderingEnabled);
+    _volumeRenderingEnabled = p.volumeRenderingEnabled.value_or(_volumeRenderingEnabled);
+    _stepSize = p.stepSizeInfo.value_or(_stepSize);
+    _absorptionMultiply = p.absorptionMultiply.value_or(_absorptionMultiply);
+    _emissionMultiply = p.emissionMultiply.value_or(_emissionMultiply);
 
     _starRenderingMethod.addOptions({
         { 0, "Points" },
         { 1, "Billboards" }
     });
-    if (dictionary.hasKey(StarRenderingMethodInfo.identifier)) {
-        const std::string starRenderingMethod = dictionary.value<std::string>(
-            StarRenderingMethodInfo.identifier
-        );
-        if (starRenderingMethod == "Points") {
-            _starRenderingMethod = 0;
-        }
-        else if (starRenderingMethod == "Billboards") {
-            _starRenderingMethod = 1;
+    if (p.starRenderingMethod.has_value()) {
+        switch (*p.starRenderingMethod) {
+            case Parameters::StarRenderingMethod::Points:
+                _starRenderingMethod = 0;
+                break;
+            case Parameters::StarRenderingMethod::Billboards:
+                _starRenderingMethod = 1;
+                break;
         }
     }
 
-    if (dictionary.hasValue<glm::dvec3>(TranslationInfo.identifier)) {
-        _translation = dictionary.value<glm::dvec3>(TranslationInfo.identifier);
-    }
+    _rotation = p.rotation.value_or(_rotation);
 
-    if (dictionary.hasValue<glm::dvec3>(RotationInfo.identifier)) {
-        _rotation = dictionary.value<glm::dvec3>(RotationInfo.identifier);
-    }
+    _volumeFilename = p.volume.filename.string();
+    _volumeDimensions = p.volume.dimensions;
+    _volumeSize = p.volume.size;
+    _numberOfRayCastingSteps = p.volume.steps.value_or(_numberOfRayCastingSteps);
+    _downScaleVolumeRendering = p.volume.downscale.value_or(_downScaleVolumeRendering);
 
-    if (!dictionary.hasValue<ghoul::Dictionary>("Volume")) {
-        LERROR("No volume dictionary specified.");
-    }
-
-    ghoul::Dictionary volumeDictionary = dictionary.value<ghoul::Dictionary>("Volume");
-
-    if (volumeDictionary.hasValue<std::string>("Filename")) {
-        _volumeFilename = absPath(volumeDictionary.value<std::string>("Filename"));
-    }
-    else {
-        LERROR("No volume filename specified");
-    }
-
-    if (volumeDictionary.hasValue<glm::dvec3>("Dimensions")) {
-        _volumeDimensions = volumeDictionary.value<glm::dvec3>("Dimensions");
-    }
-    else {
-        LERROR("No volume dimensions specifieds");
-    }
-
-    if (volumeDictionary.hasValue<glm::dvec3>("Size")) {
-        _volumeSize = volumeDictionary.value<glm::dvec3>("Size");
-    }
-    else {
-        LERROR("No volume dimensions specified.");
-    }
-
-    if (volumeDictionary.hasKey(NumberOfRayCastingStepsInfo.identifier)) {
-        _numberOfRayCastingSteps = static_cast<float>(
-            volumeDictionary.value<double>(NumberOfRayCastingStepsInfo.identifier)
-        );
-    }
-    else {
-        LINFO("Number of raycasting steps not specified. Using default value.");
-    }
-
-    _downScaleVolumeRendering.setVisibility(properties::Property::Visibility::Developer);
-    if (volumeDictionary.hasKey(DownscaleVolumeRenderingInfo.identifier)) {
-        _downScaleVolumeRendering = static_cast<float>(
-            volumeDictionary.value<double>(DownscaleVolumeRenderingInfo.identifier)
-        );
-    }
-
-    if (!dictionary.hasValue<ghoul::Dictionary>("Points")) {
-        LERROR("No points dictionary specified.");
-    }
-
-    ghoul::Dictionary pointsDictionary = dictionary.value<ghoul::Dictionary>("Points");
-    if (pointsDictionary.hasValue<std::string>("Filename")) {
-        _pointsFilename = absPath(pointsDictionary.value<std::string>("Filename"));
-    }
-    else {
-        LERROR("No points filename specified.");
-    }
-
-    if (pointsDictionary.hasValue<double>(EnabledPointsRatioInfo.identifier)) {
-        _enabledPointsRatio = static_cast<float>(
-            pointsDictionary.value<double>(EnabledPointsRatioInfo.identifier)
-        );
-    }
-
-    if (pointsDictionary.hasValue<std::string>("Texture")) {
-        _pointSpreadFunctionTexturePath =
-            absPath(pointsDictionary.value<std::string>("Texture"));
-        _pointSpreadFunctionFile = std::make_unique<ghoul::filesystem::File>(
-            _pointSpreadFunctionTexturePath
-        );
-    }
-    else {
-        LERROR("No points filename specified.");
-    }
+    _pointsFilename = p.points.filename.string();
+    _enabledPointsRatio = p.points.enabledPointsRatio.value_or(_enabledPointsRatio);
+    _pointSpreadFunctionTexturePath = p.points.texture.string();
+    _pointSpreadFunctionFile = std::make_unique<ghoul::filesystem::File>(
+        _pointSpreadFunctionTexturePath
+    );
 
     auto onChange = [&](bool enabled) {
         if (enabled) {
@@ -342,8 +301,8 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
     addProperty(_emissionMultiply);
     addProperty(_starRenderingMethod);
     addProperty(_enabledPointsRatio);
-    addProperty(_translation);
     addProperty(_rotation);
+    _downScaleVolumeRendering.setVisibility(properties::Property::Visibility::Developer);
     addProperty(_downScaleVolumeRendering);
     addProperty(_numberOfRayCastingSteps);
 }
@@ -352,8 +311,8 @@ void RenderableGalaxy::initialize() {
     ZoneScoped
 
     // Aspect is currently hardcoded to cubic voxels.
-    _aspect = static_cast<glm::vec3>(_volumeDimensions);
-    _aspect /= std::max(std::max(_aspect.x, _aspect.y), _aspect.z);
+    glm::vec3 d = _volumeDimensions;
+    _aspect = d / glm::compMax(d);
 
     // The volume
     volume::RawVolumeReader<glm::tvec4<GLubyte>> reader(
@@ -363,10 +322,9 @@ void RenderableGalaxy::initialize() {
     _volume = reader.read();
 
     std::string cachedPointsFile = FileSys.cacheManager()->cachedFilename(
-        _pointsFilename,
-        ghoul::filesystem::CacheManager::Persistent::Yes
+        _pointsFilename
     );
-    const bool hasCachedFile = FileSys.fileExists(cachedPointsFile);
+    const bool hasCachedFile = std::filesystem::is_regular_file(cachedPointsFile);
     if (hasCachedFile) {
         LINFO(fmt::format("Cached file '{}' used for galaxy point file '{}'",
             cachedPointsFile, _pointsFilename
@@ -379,7 +337,7 @@ void RenderableGalaxy::initialize() {
         }
         else {
             FileSys.cacheManager()->removeCacheFile(_pointsFilename);
-            Result resPoint = loadPointFile(_pointsFilename);
+            Result resPoint = loadPointFile();
             _pointPositionsCache = std::move(resPoint.positions);
             _pointColorsCache = std::move(resPoint.color);
             saveCachedFile(
@@ -392,7 +350,7 @@ void RenderableGalaxy::initialize() {
         }
     }
     else {
-        Result res = loadPointFile(_pointsFilename);
+        Result res = loadPointFile();
         ghoul_assert(res.success, "Point file loading failed");
         _pointPositionsCache = std::move(res.positions);
         _pointColorsCache = std::move(res.color);
@@ -455,13 +413,12 @@ void RenderableGalaxy::initializeGL() {
 
     if (!_pointSpreadFunctionTexturePath.empty()) {
         _pointSpreadFunctionTexture = ghoul::io::TextureReader::ref().loadTexture(
-            absPath(_pointSpreadFunctionTexturePath)
+            absPath(_pointSpreadFunctionTexturePath).string()
         );
 
         if (_pointSpreadFunctionTexture) {
             LDEBUG(fmt::format(
-                "Loaded texture from '{}'",
-                absPath(_pointSpreadFunctionTexturePath)
+                "Loaded texture from {}", absPath(_pointSpreadFunctionTexturePath)
             ));
             _pointSpreadFunctionTexture->uploadTexture();
         }
@@ -485,42 +442,33 @@ void RenderableGalaxy::initializeGL() {
         UniformNamesBillboards
     );
 
-    _pointsProgram->setIgnoreUniformLocationError(
-        ghoul::opengl::ProgramObject::IgnoreError::Yes
-    );
-
-    GLint positionAttrib = _pointsProgram->attributeLocation("in_position");
-    GLint colorAttrib = _pointsProgram->attributeLocation("in_color");
-
     glGenVertexArrays(1, &_pointsVao);
     glGenBuffers(1, &_positionVbo);
     glGenBuffers(1, &_colorVbo);
 
     glBindVertexArray(_pointsVao);
     glBindBuffer(GL_ARRAY_BUFFER, _positionVbo);
-    glBufferData(GL_ARRAY_BUFFER,
+    glBufferData(
+        GL_ARRAY_BUFFER,
         _pointPositionsCache.size() * sizeof(glm::vec3),
         _pointPositionsCache.data(),
         GL_STATIC_DRAW
     );
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
     _pointPositionsCache.clear();
 
     glBindBuffer(GL_ARRAY_BUFFER, _colorVbo);
-    glBufferData(GL_ARRAY_BUFFER,
+    glBufferData(
+        GL_ARRAY_BUFFER,
         _pointColorsCache.size() * sizeof(glm::vec3),
         _pointColorsCache.data(),
         GL_STATIC_DRAW
     );
+    glEnableVertexAttribArray(1);
+    glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
     _pointColorsCache.clear();
 
-    glBindBuffer(GL_ARRAY_BUFFER, _positionVbo);
-    glEnableVertexAttribArray(positionAttrib);
-    glVertexAttribPointer(positionAttrib, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
-
-    glBindBuffer(GL_ARRAY_BUFFER, _colorVbo);
-    glEnableVertexAttribArray(colorAttrib);
-    glVertexAttribPointer(colorAttrib, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
-
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     glBindVertexArray(0);
 }
@@ -544,7 +492,6 @@ void RenderableGalaxy::update(const UpdateData& data) {
     if (!_raycaster) {
         return;
     }
-    //glm::mat4 transform = glm::translate(, static_cast<glm::vec3>(_translation));
     const glm::vec3 eulerRotation = static_cast<glm::vec3>(_rotation);
     glm::mat4 transform = glm::rotate(
         glm::mat4(1.f),
@@ -556,14 +503,6 @@ void RenderableGalaxy::update(const UpdateData& data) {
 
     glm::mat4 volumeTransform = glm::scale(transform, _volumeSize);
     _pointTransform = transform;
-    //_pointTransform = glm::scale(transform, _pointScaling);
-
-    const glm::vec4 translation = glm::vec4(_translation.value()*_volumeSize, 0.f);
-
-    // Todo: handle floating point overflow, to actually support translation.
-
-    volumeTransform[3] += translation;
-    _pointTransform[3] += translation;
 
     _raycaster->setDownscaleRender(_downScaleVolumeRendering);
     _raycaster->setMaxSteps(static_cast<int>(_numberOfRayCastingSteps));
@@ -584,7 +523,7 @@ void RenderableGalaxy::render(const RenderData& data, RendererTasks& tasks) {
         const float length = safeLength(position);
         const glm::vec3 galaxySize = _volumeSize;
 
-        const float maxDim = std::max(std::max(galaxySize.x, galaxySize.y), galaxySize.z);
+        const float maxDim = glm::compMax(galaxySize);
 
         const float lowerRampStart = maxDim * 0.01f;
         const float lowerRampEnd = maxDim * 0.1f;
@@ -605,7 +544,7 @@ void RenderableGalaxy::render(const RenderData& data, RendererTasks& tasks) {
         }
         else if (length < upperRampEnd) {
             opacityCoefficient = 1.f - (length - upperRampStart) /
-                                 (upperRampEnd - upperRampStart); //fade out
+                                 (upperRampEnd - upperRampStart); // fade out
         }
         else {
             opacityCoefficient = 0;
@@ -622,22 +561,23 @@ void RenderableGalaxy::render(const RenderData& data, RendererTasks& tasks) {
         }
     }
 
-    // Render the stars
-    if (_starRenderingEnabled && _opacityCoefficient > 0.f) {
-        if (_starRenderingMethod == 1) {
+    if (!(_starRenderingEnabled && _opacityCoefficient > 0.f)) {
+        return;
+    }
+
+    if (_starRenderingMethod == 1) {
+        if (_billboardsProgram) {
             renderBillboards(data);
         }
-        else {
+    }
+    else {
+        if (_pointsProgram) {
             renderPoints(data);
         }
     }
 }
 
 void RenderableGalaxy::renderPoints(const RenderData& data) {
-    if (!_pointsProgram) {
-        return;
-    }
-
     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
     glDepthMask(false);
     glDisable(GL_DEPTH_TEST);
@@ -680,7 +620,6 @@ void RenderableGalaxy::renderPoints(const RenderData& data) {
 
     glBindVertexArray(_pointsVao);
     glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_nPoints * _enabledPointsRatio));
-
     glBindVertexArray(0);
 
     _pointsProgram->deactivate();
@@ -691,10 +630,6 @@ void RenderableGalaxy::renderPoints(const RenderData& data) {
 }
 
 void RenderableGalaxy::renderBillboards(const RenderData& data) {
-    if (!_billboardsProgram) {
-        return;
-    }
-
     // Change OpenGL Blending and Depth states
     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
     glDepthMask(false);
@@ -742,7 +677,6 @@ void RenderableGalaxy::renderBillboards(const RenderData& data) {
 
     glBindVertexArray(_pointsVao);
     glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(_nPoints * _enabledPointsRatio));
-
     glBindVertexArray(0);
 
     _billboardsProgram->deactivate();
@@ -752,14 +686,7 @@ void RenderableGalaxy::renderBillboards(const RenderData& data) {
     global::renderEngine->openglStateCache().resetDepthState();
 }
 
-float RenderableGalaxy::safeLength(const glm::vec3& vector) const {
-    const float maxComponent = std::max(
-        std::max(std::abs(vector.x), std::abs(vector.y)), std::abs(vector.z)
-    );
-    return glm::length(vector / maxComponent) * maxComponent;
-}
-
-RenderableGalaxy::Result RenderableGalaxy::loadPointFile(const std::string&) {
+RenderableGalaxy::Result RenderableGalaxy::loadPointFile() {
     std::vector<glm::vec3> pointPositions;
     std::vector<glm::vec3> pointColors;
     int64_t nPoints;
@@ -779,11 +706,11 @@ RenderableGalaxy::Result RenderableGalaxy::loadPointFile(const std::string&) {
     _nPoints = static_cast<size_t>(nPoints);
 
     // Read points
-    float x, y, z, r, g, b, a;
     for (size_t i = 0;
         i < static_cast<size_t>(_nPoints * _enabledPointsRatio.maxValue()) + 1;
         ++i)
     {
+        float x, y, z, r, g, b, a;
         std::getline(pointFile, line);
         std::istringstream issp(line);
         issp >> x >> y >> z >> r >> g >> b >> a;
@@ -838,10 +765,7 @@ RenderableGalaxy::Result RenderableGalaxy::loadCachedFile(const std::string& fil
     fileStream.read(reinterpret_cast<char*>(&nColors), sizeof(uint64_t));
     std::vector<glm::vec3> colors;
     colors.resize(nColors);
-    fileStream.read(
-        reinterpret_cast<char*>(colors.data()),
-        nColors * sizeof(glm::vec3)
-    );
+    fileStream.read(reinterpret_cast<char*>(colors.data()), nColors * sizeof(glm::vec3));
 
     Result result;
     result.success = true;
diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h
index 889f2953a2..45dbcd1df7 100644
--- a/modules/galaxy/rendering/renderablegalaxy.h
+++ b/modules/galaxy/rendering/renderablegalaxy.h
@@ -57,14 +57,13 @@ public:
 private:
     void renderPoints(const RenderData& data);
     void renderBillboards(const RenderData& data);
-    float safeLength(const glm::vec3& vector) const;
 
     struct Result {
         bool success;
         std::vector<glm::vec3> positions;
         std::vector<glm::vec3> color;
     };
-    Result loadPointFile(const std::string& file);
+    Result loadPointFile();
     Result loadCachedFile(const std::string& file);
 
     glm::vec3 _volumeSize = glm::vec3(0.f);
@@ -76,7 +75,6 @@ private:
     properties::FloatProperty _emissionMultiply;
     properties::OptionProperty _starRenderingMethod;
     properties::FloatProperty _enabledPointsRatio;
-    properties::Vec3Property _translation;
     properties::Vec3Property _rotation;
     properties::FloatProperty _downScaleVolumeRendering;
     properties::FloatProperty _numberOfRayCastingSteps;
diff --git a/modules/galaxy/shaders/billboard_fs.glsl b/modules/galaxy/shaders/billboard_fs.glsl
index 69931514a8..30930c7495 100644
--- a/modules/galaxy/shaders/billboard_fs.glsl
+++ b/modules/galaxy/shaders/billboard_fs.glsl
@@ -23,28 +23,25 @@
  ****************************************************************************************/
 
 #include "fragment.glsl"
-#include "floatoperations.glsl"
-
-uniform sampler2D psfTexture;
 
 in vec4 vs_position;
 in vec2 psfCoords;
 flat in vec3 ge_color;
 flat in float ge_screenSpaceDepth;
 
+uniform sampler2D psfTexture;
+
 Fragment getFragment() {
-    Fragment frag;
+  vec4 textureColor = texture(psfTexture, 0.5 * psfCoords + 0.5);
+  vec4 fullColor = vec4(ge_color * textureColor.a, textureColor.a);
+  if (fullColor.a == 0) {
+    discard;
+  }
 
-    vec4 textureColor = texture(psfTexture, 0.5*psfCoords + 0.5);
-    vec4 fullColor = vec4(ge_color*textureColor.a, textureColor.a);
-    if (fullColor.a == 0) {
-        discard;
-    }
-    frag.color = fullColor;
-
-    frag.depth = ge_screenSpaceDepth;
-    frag.gPosition = vs_position;
-    frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
-
-    return frag;
+  Fragment frag;
+  frag.color = fullColor;
+  frag.depth = ge_screenSpaceDepth;
+  frag.gPosition = vs_position;
+  frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
+  return frag;
 }
diff --git a/modules/galaxy/shaders/billboard_ge.glsl b/modules/galaxy/shaders/billboard_ge.glsl
index 0cd652d36f..49a23edbca 100644
--- a/modules/galaxy/shaders/billboard_ge.glsl
+++ b/modules/galaxy/shaders/billboard_ge.glsl
@@ -27,11 +27,6 @@
 #include "floatoperations.glsl"
 #include "PowerScaling/powerScalingMath.hglsl"
 
-uniform dvec3 eyePosition;
-uniform dvec3 cameraUp;
-uniform dmat4 cameraViewProjectionMatrix;
-uniform dmat4 modelMatrix;
-
 layout(points) in;
 layout(triangle_strip, max_vertices = 4) out;
 
@@ -43,59 +38,63 @@ out vec2 psfCoords;
 flat out vec3 ge_color;
 flat out float ge_screenSpaceDepth;
 
+uniform dvec3 eyePosition;
+uniform dvec3 cameraUp;
+uniform dmat4 viewProjectionMatrix;
+uniform dmat4 modelMatrix;
+
 const double PARSEC = 3.08567756E16;
 
 void main() {
-    vs_position = gl_in[0].gl_Position; // in object space
-    ge_color = vs_color[0];
+  vs_position = gl_in[0].gl_Position;
+  ge_color = vs_color[0];
 
-    double scaleMultiply = 8.0;
+  double scaleMultiply = 8.0;
 
-    dvec4 dpos = dvec4(vs_position);
-    dpos.xyz *= scaleMultiply;
-    dpos = modelMatrix * dpos;
-    dpos /= PARSEC;
-    //It lies about 8 kpc from the center on what is known as the Orion Arm of the Milky Way
-    dpos.x += 8000;
+  dvec4 dpos = dvec4(vs_position);
+  dpos.xyz *= scaleMultiply;
+  dpos = modelMatrix * dpos;
+  dpos /= PARSEC;
+  // It lies about 8 kpc from the center on the Orion Arm of the Milky Way
+  dpos.x += 8000;
 
-    scaleMultiply *= 4.0;
-    dvec3 scaledRight    = dvec3(0.0);
-    dvec3 scaledUp       = dvec3(0.0);
-    vec4 bottomLeftVertex, bottomRightVertex, topLeftVertex, topRightVertex;
+  scaleMultiply *= 4.0;
 
-    dvec3 normal   = normalize(eyePosition - dpos.xyz);
-    dvec3 newRight = normalize(cross(cameraUp, normal));
-    dvec3 newUp    = cross(normal, newRight);
-    scaledRight    = scaleMultiply * newRight;
-    scaledUp       = scaleMultiply * newUp;
+  dvec3 normal = normalize(eyePosition - dpos.xyz);
+  dvec3 newRight = normalize(cross(cameraUp, normal));
+  dvec3 newUp = cross(normal, newRight);
+  dvec3 scaledRight = scaleMultiply * newRight;
+  dvec3 scaledUp = scaleMultiply * newUp;
 
-    bottomLeftVertex = z_normalization(vec4(cameraViewProjectionMatrix *
-                        dvec4(dpos.xyz - scaledRight - scaledUp, dpos.w)));
+  vec4 bottomLeftVertex = z_normalization(
+    vec4(viewProjectionMatrix * dvec4(dpos.xyz - scaledRight - scaledUp, dpos.w))
+  );
 
-    //dvec4 dposCamera = cameraViewProjectionMatrix * dpos;
-    //ge_screenSpaceDepth = float(length(eyePosition - dposCamera.xyz)/PARSEC);
-    ge_screenSpaceDepth  = bottomLeftVertex.w;
+  ge_screenSpaceDepth  = bottomLeftVertex.w;
 
-    topRightVertex = z_normalization(vec4(cameraViewProjectionMatrix *
-                            dvec4(dpos.xyz + scaledUp + scaledRight, dpos.w)));
+  vec4 topRightVertex = z_normalization(
+    vec4(viewProjectionMatrix * dvec4(dpos.xyz + scaledUp + scaledRight, dpos.w))
+  );
 
-    bottomRightVertex = z_normalization(vec4(cameraViewProjectionMatrix *
-                    dvec4(dpos.xyz + scaledRight - scaledUp, dpos.w)));
-    topLeftVertex = z_normalization(vec4(cameraViewProjectionMatrix *
-                        dvec4(dpos.xyz + scaledUp - scaledRight, dpos.w)));
+  vec4 bottomRightVertex = z_normalization(
+    vec4(viewProjectionMatrix * dvec4(dpos.xyz + scaledRight - scaledUp, dpos.w))
+  );
+  vec4 topLeftVertex = z_normalization(
+    vec4(viewProjectionMatrix * dvec4(dpos.xyz + scaledUp - scaledRight, dpos.w))
+  );
 
-    // Build primitive
-    gl_Position = topLeftVertex;
-    psfCoords   = vec2(-1.0, 1.0);
-    EmitVertex();
-    gl_Position = bottomLeftVertex;
-    psfCoords   = vec2(-1.0, -1.0);
-    EmitVertex();
-    gl_Position = topRightVertex;
-    psfCoords   = vec2(1.0, 1.0);
-    EmitVertex();
-    gl_Position = bottomRightVertex;
-    psfCoords   = vec2(1.0, -1.0);
-    EmitVertex();
-    EndPrimitive();
+  // Build primitive
+  gl_Position = topLeftVertex;
+  psfCoords = vec2(-1.0, 1.0);
+  EmitVertex();
+  gl_Position = bottomLeftVertex;
+  psfCoords = vec2(-1.0, -1.0);
+  EmitVertex();
+  gl_Position = topRightVertex;
+  psfCoords = vec2(1.0, 1.0);
+  EmitVertex();
+  gl_Position = bottomRightVertex;
+  psfCoords = vec2(1.0, -1.0);
+  EmitVertex();
+  EndPrimitive();
 }
diff --git a/modules/galaxy/shaders/billboard_vs.glsl b/modules/galaxy/shaders/billboard_vs.glsl
index 36e1cb8f56..f466ef2103 100644
--- a/modules/galaxy/shaders/billboard_vs.glsl
+++ b/modules/galaxy/shaders/billboard_vs.glsl
@@ -30,6 +30,6 @@ layout(location = 1) in vec3 in_color;
 out vec3 vs_color;
 
 void main() {
-	vs_color = in_color;
-	gl_Position = vec4(in_position, 1.0);
+  vs_color = in_color;
+  gl_Position = vec4(in_position, 1.0);
 }
diff --git a/modules/galaxy/shaders/galaxyraycast.glsl b/modules/galaxy/shaders/galaxyraycast.glsl
index 5bc7bcb4c6..a73e31501e 100644
--- a/modules/galaxy/shaders/galaxyraycast.glsl
+++ b/modules/galaxy/shaders/galaxyraycast.glsl
@@ -29,49 +29,45 @@ uniform float absorptionMultiply#{id} = 50.0;
 uniform float emissionMultiply#{id} = 1500.0;
 uniform sampler3D galaxyTexture#{id};
 
-void sample#{id}(
-  vec3 samplePos,
-  vec3 dir,
-  inout vec3 accumulatedColor,
-  inout vec3 accumulatedAlpha,
-  inout float stepSize
-  ) {
-    vec3 aspect = aspect#{id};
-    stepSize = maxStepSize#{id} / length(dir / aspect);
+void sample#{id}(vec3 samplePos, vec3 dir, inout vec3 accumulatedColor,
+                 inout vec3 accumulatedAlpha, inout float stepSize)
+{
+  vec3 aspect = aspect#{id};
+  stepSize = maxStepSize#{id} / length(dir / aspect);
 
-    //Early ray termination on black parts of the data
-    vec3 normalizedPos = samplePos * 2.f - 1.f;
-    if (normalizedPos.x * normalizedPos.x + normalizedPos.y * normalizedPos.y > 0.7) {
-        return;
-    }
-
-    vec4 sampledColor = texture(galaxyTexture#{id}, samplePos.xyz);
-
-    // Source textures currently are square-rooted to avoid dithering in the shadows.
-    // So square them back
-    sampledColor = sampledColor*sampledColor;
-
-    // Fudge for the dust "spreading"
-    sampledColor.a = clamp(sampledColor.a, 0.f, 1.f);
-    sampledColor.a = pow(sampledColor.a, 0.7f);
-
-    // Absorption probability
-    float scaledDensity = sampledColor.a * stepSize * absorptionMultiply#{id};
-    vec3 alphaTint = vec3(0.3f, 0.54f, 0.85f);
-    vec3 absorption = alphaTint * scaledDensity;
-
-    // Extinction
-    vec3 extinction = exp(-absorption);
-    accumulatedColor.rgb *= extinction;
-
-    // Emission
-    accumulatedColor.rgb +=
-        sampledColor.rgb * stepSize * emissionMultiply#{id} * opacityCoefficient#{id};
-
-    vec3 oneMinusFrontAlpha = vec3(1.f) - accumulatedAlpha;
-    accumulatedAlpha += oneMinusFrontAlpha * sampledColor.rgb  * opacityCoefficient#{id};
+  // Early ray termination on black parts of the data
+  vec3 normalizedPos = samplePos * 2.0 - 1.0;
+  if (normalizedPos.x * normalizedPos.x + normalizedPos.y * normalizedPos.y > 0.7) {
+    return;
   }
 
-  float stepSize#{id}(vec3 samplePos, vec3 dir) {
-    return maxStepSize#{id} * length(dir * 1.f / aspect#{id});
-  }
+  vec4 sampledColor = texture(galaxyTexture#{id}, samplePos.xyz);
+
+  // Source textures currently are square-rooted to avoid dithering in the shadows.
+  // So square them back
+  sampledColor = sampledColor*sampledColor;
+
+  // Fudge for the dust "spreading"
+  sampledColor.a = clamp(sampledColor.a, 0.0, 1.0);
+  sampledColor.a = pow(sampledColor.a, 0.7);
+
+  // Absorption probability
+  float scaledDensity = sampledColor.a * stepSize * absorptionMultiply#{id};
+  vec3 alphaTint = vec3(0.3, 0.54, 0.85);
+  vec3 absorption = alphaTint * scaledDensity;
+
+  // Extinction
+  vec3 extinction = exp(-absorption);
+  accumulatedColor.rgb *= extinction;
+
+  // Emission
+  accumulatedColor.rgb +=
+    sampledColor.rgb * stepSize * emissionMultiply#{id} * opacityCoefficient#{id};
+
+  vec3 oneMinusFrontAlpha = vec3(1.0) - accumulatedAlpha;
+  accumulatedAlpha += oneMinusFrontAlpha * sampledColor.rgb  * opacityCoefficient#{id};
+}
+
+float stepSize#{id}(vec3 samplePos, vec3 dir) {
+  return maxStepSize#{id} * length(dir * 1.0 / aspect#{id});
+}
diff --git a/modules/galaxy/shaders/points_fs.glsl b/modules/galaxy/shaders/points_fs.glsl
index 025834723f..d3c2220566 100644
--- a/modules/galaxy/shaders/points_fs.glsl
+++ b/modules/galaxy/shaders/points_fs.glsl
@@ -33,16 +33,23 @@ in float vs_starBrightness;
 uniform float opacityCoefficient;
 
 Fragment getFragment() {
-    Fragment frag;
+  Fragment frag;
 
-    float multipliedOpacityCoefficient = opacityCoefficient*opacityCoefficient;
-    vec3 extinction = exp(vec3(0.6, 0.2, 0.3) - vs_color);
-    vec4 fullColor = vec4(vs_color*extinction*vs_starBrightness*multipliedOpacityCoefficient, opacityCoefficient);
-    frag.color = fullColor;
+  float multipliedOpacityCoefficient = opacityCoefficient * opacityCoefficient;
+  vec3 extinction = exp(vec3(0.6, 0.2, 0.3) - vs_color);
 
-    frag.depth = vs_screenSpaceDepth;
-    frag.gPosition = vs_position;
-    frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
+  // We use the star brightness as the alpha value here to dim the stars as the camera
+  // moves further away.  Otherwise they would occlude the main milkway image even though
+  // they themselves nolonger have any color contribution left
+  vec4 fullColor = vec4(
+    vs_color * extinction * vs_starBrightness * multipliedOpacityCoefficient,
+    vs_starBrightness
+  );
+  frag.color = fullColor;
 
-    return frag;
+  frag.depth = vs_screenSpaceDepth;
+  frag.gPosition = vs_position;
+  frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
+
+  return frag;
 }
diff --git a/modules/galaxy/shaders/points_vs.glsl b/modules/galaxy/shaders/points_vs.glsl
index 9b7612e4c5..ae1a199dc8 100644
--- a/modules/galaxy/shaders/points_vs.glsl
+++ b/modules/galaxy/shaders/points_vs.glsl
@@ -34,7 +34,7 @@ out vec3 vs_color;
 out float vs_screenSpaceDepth;
 out float vs_starBrightness;
 
-uniform dmat4 cameraViewProjectionMatrix;
+uniform dmat4 viewProjectionMatrix;
 uniform dmat4 modelMatrix;
 uniform dvec3 eyePosition;
 
@@ -44,14 +44,14 @@ void main() {
 	vs_position = vec4(in_position, 1.0);
 	dvec4 dpos = dvec4(vs_position);
 
-	double distanceToStar = length((dpos.xyz - eyePosition));
-	vs_starBrightness = clamp(float(8000*PARSEC/distanceToStar), 0.0, 1.0);
+	double distanceToStar = length(dpos.xyz - eyePosition);
+	vs_starBrightness = clamp(float(8000.0 * PARSEC / distanceToStar), 0.0, 1.0);
 
 	dpos.xyz *= 8.0;
 	dpos = modelMatrix * dpos;
 	dpos /= PARSEC;
 
-	vec4 positionScreenSpace = z_normalization(vec4(cameraViewProjectionMatrix * dpos));
+	vec4 positionScreenSpace = z_normalization(vec4(viewProjectionMatrix * dpos));
 	vs_color = in_color;
 	vs_screenSpaceDepth = positionScreenSpace.w;
 	gl_Position = positionScreenSpace;
diff --git a/modules/galaxy/shaders/raycasterbounds_fs.glsl b/modules/galaxy/shaders/raycasterbounds_fs.glsl
index 50013a0642..7cd49070e7 100644
--- a/modules/galaxy/shaders/raycasterbounds_fs.glsl
+++ b/modules/galaxy/shaders/raycasterbounds_fs.glsl
@@ -29,18 +29,10 @@ in vec3 modelPosition;
 in vec4 viewPosition;
 
 Fragment getFragment() {
-    Fragment frag;
-    //Early ray termination on black parts of the data
-    /*vec3 normalizedPos = (modelPosition*2.0)-1.0;
-    if (abs(modelPosition.x) > 0.9 || abs(modelPosition.y) > 0.9) {
-      frag.color = vec4(0.0, 0.0, 0.0, 1.0);
-    }
-    else {*/
-      vec3 pos = modelPosition + 0.5;
-      //vec3 posClamp = clamp(pos, vec3(0.0), vec3(1.0));
-      frag.color = vec4(pos, 1.0);
-    //}
+  Fragment frag;
+  vec3 pos = modelPosition + 0.5;
+  frag.color = vec4(pos, 1.0);
 
-    frag.depth = safeLength(viewPosition);
-    return frag;
+  frag.depth = safeLength(viewPosition);
+  return frag;
 }
diff --git a/modules/galaxy/shaders/raycasterbounds_vs.glsl b/modules/galaxy/shaders/raycasterbounds_vs.glsl
index acd3fb47b2..edcf6acea7 100644
--- a/modules/galaxy/shaders/raycasterbounds_vs.glsl
+++ b/modules/galaxy/shaders/raycasterbounds_vs.glsl
@@ -24,20 +24,20 @@
 
 #version __CONTEXT__
 
+#include "PowerScaling/powerScalingMath.hglsl"
+
 layout(location = 0) in vec4 vertPosition;
 
 out vec3 modelPosition;
 out vec4 viewPosition;
 
 uniform mat4 projectionTransform;
-uniform mat4 modelViewTransform;
-
+uniform dmat4 modelViewTransform;
 
 void main() {
-    modelPosition = vertPosition.xyz;
-    viewPosition = modelViewTransform*vertPosition;
+  modelPosition = vertPosition.xyz;
+  dvec4 vp = modelViewTransform * vertPosition;
+  viewPosition = vec4(vp);
 
-    // project the position to view space
-    gl_Position = projectionTransform * viewPosition;
-    gl_Position.z = 0.0;
+  gl_Position = z_normalization(vec4(projectionTransform * viewPosition));
 }
diff --git a/modules/globebrowsing/CMakeLists.txt b/modules/globebrowsing/CMakeLists.txt
index 4e2434894b..2b0496967b 100644
--- a/modules/globebrowsing/CMakeLists.txt
+++ b/modules/globebrowsing/CMakeLists.txt
@@ -94,7 +94,7 @@ source_group("Source Files" FILES ${SOURCE_FILES})
 set(SHADER_FILES
   shaders/advanced_rings_vs.glsl
   shaders/advanced_rings_fs.glsl
-  shaders/blending.hglsl
+  shaders/blending.glsl
   shaders/globalrenderer_vs.glsl
   shaders/localrenderer_vs.glsl
   shaders/renderer_fs.glsl
@@ -102,10 +102,10 @@ set(SHADER_FILES
   shaders/rings_fs.glsl
   shaders/rings_geom_vs.glsl
   shaders/rings_geom_fs.glsl
-  shaders/texturetilemapping.hglsl
-  shaders/tile.hglsl
-  shaders/tileheight.hglsl
-  shaders/tilevertexskirt.hglsl
+  shaders/texturetilemapping.glsl
+  shaders/tile.glsl
+  shaders/tileheight.glsl
+  shaders/tilevertexskirt.glsl
 )
 
 source_group("Shader Files" FILES ${SHADER_FILES})
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index c8618ad63f..89b7fe275b 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -124,12 +124,16 @@ namespace {
             int iDataset = -1;
             std::array<char, 256> IdentifierBuffer;
             std::fill(IdentifierBuffer.begin(), IdentifierBuffer.end(), '\0');
-            sscanf(
+            int ret = sscanf(
                 subDatasets[i],
                 "SUBDATASET_%i_%256[^=]",
                 &iDataset,
                 IdentifierBuffer.data()
             );
+            if (ret != 2) {
+                LERROR("Error parsing dataset");
+                continue;
+            }
 
 
             if (iDataset != currentLayerNumber) {
@@ -454,6 +458,7 @@ std::vector<documentation::Documentation> GlobeBrowsingModule::documentations()
         globebrowsing::LayerAdjustment::Documentation(),
         globebrowsing::LayerManager::Documentation(),
         globebrowsing::GlobeTranslation::Documentation(),
+        globebrowsing::RenderableGlobe::Documentation(),
         GlobeLabelsComponent::Documentation(),
         RingsComponent::Documentation(),
         ShadowComponent::Documentation()
diff --git a/modules/globebrowsing/scripts/layer_support.lua b/modules/globebrowsing/scripts/layer_support.lua
index e6153e0d84..82678d901c 100644
--- a/modules/globebrowsing/scripts/layer_support.lua
+++ b/modules/globebrowsing/scripts/layer_support.lua
@@ -63,13 +63,12 @@ openspace.globebrowsing.documentation = {
         Name = "parseInfoFile",
         Arguments = "string",
         Documentation =
-            "Parses the passed info file and returns two tables. The first return value " ..
-            "contains the table for the color layer of a RenderableGlobe. The second " ..
-            "return value contains the table for the height layer of a RenderableGlobe." ..
-            "Usage: local color, height = openspace.globebrowsing.parseInfoFile(file)" ..
-            "openspace.globebrowsing.addLayer(\"Earth\", \"ColorLayers\", color)" ..
-            "openspace.globebrowsing.addLayer(\"Earth\", \"HeightLayers\", height)"
-
+            "Parses the passed info file and return the table with the information " ..
+            "provided in the info file. The return table contains the optional keys: " ..
+            "'Color', 'Height', 'Node', 'Location', 'Identifier'." ..
+            "Usage: local t = openspace.globebrowsing.parseInfoFile(file)" ..
+            "openspace.globebrowsing.addLayer(\"Earth\", \"ColorLayers\", t.color)" ..
+            "openspace.globebrowsing.addLayer(\"Earth\", \"HeightLayers\", t.height)"
     },
     {
         Name = "addBlendingLayersFromDirectory",
@@ -264,7 +263,13 @@ openspace.globebrowsing.parseInfoFile = function (file)
         location = Location
     end
 
-    return name, color, height, location, identifier
+    return {
+        Color = color,
+        Height = height,
+        Name = name,
+        Location = location,
+        Identifier = identifier
+    }
 end
 
 openspace.globebrowsing.addBlendingLayersFromDirectory = function (dir, node_name)
@@ -290,16 +295,14 @@ openspace.globebrowsing.addBlendingLayersFromDirectory = function (dir, node_nam
 
     for _, file in pairs(files) do
         if file and file:find('.info') and ends_with(file, '.info') then
-            local c, h
-            _, c, h, _ = openspace.globebrowsing.parseInfoFile(file)
-
-            if c then
-                openspace.printInfo("Adding color layer '" .. c["Identifier"] .. "'")
-                openspace.globebrowsing.addLayer(node_name, "ColorLayers", c)
+            local t = openspace.globebrowsing.parseInfoFile(file)
+            if t.Color then
+                openspace.printInfo("Adding color layer '" .. t.Color["Identifier"] .. "'")
+                openspace.globebrowsing.addLayer(node_name, "ColorLayers", t.Color)
             end
-            if h then
-                openspace.printInfo("Adding height layer '" .. h["Identifier"] .. "'")
-                openspace.globebrowsing.addLayer(node_name, "HeightLayers", h)
+            if t.Height then
+                openspace.printInfo("Adding height layer '" .. t.Height["Identifier"] .. "'")
+                openspace.globebrowsing.addLayer(node_name, "HeightLayers", t.Height)
             end
         end
     end
@@ -310,19 +313,18 @@ openspace.globebrowsing.addFocusNodesFromDirectory = function (dir, node_name)
 
     for _, file in pairs(files) do
         if file and file:find('.info') then
-            local n, l
-            n, _, _, l, i = openspace.globebrowsing.parseInfoFile(file)
+            local t = openspace.globebrowsing.parseInfoFile(file)
 
-            if n and l then
+            if t.Node and t.Location then
                 openspace.printInfo("Creating focus node for '" .. n .. "'")
 
-                local lat = l.Center[2]
-                local long = l.Center[1]
+                local lat = t.Location.Center[2]
+                local long = t.Location.Center[1]
                 local a, b, c = openspace.globebrowsing.getGeoPosition(node_name, lat, long, 0.0)
                 local p = { a, b, c }
 
-                local identifier = node_name .. " - " .. i
-                local name = node_name .. " - " .. n
+                local identifier = node_name .. " - " .. t.Identifier
+                local name = node_name .. " - " .. t.Node
 
                 openspace.addSceneGraphNode({
                     Identifier = identifier,
diff --git a/modules/globebrowsing/shaders/advanced_rings_fs.glsl b/modules/globebrowsing/shaders/advanced_rings_fs.glsl
index e6ddd8bd7b..1406127d30 100644
--- a/modules/globebrowsing/shaders/advanced_rings_fs.glsl
+++ b/modules/globebrowsing/shaders/advanced_rings_fs.glsl
@@ -45,99 +45,88 @@ uniform float colorFilterValue;
 uniform vec3 sunPosition;
 uniform vec3 sunPositionObj;
 uniform vec3 camPositionObj;
-uniform float _nightFactor;
+uniform float nightFactor;
 uniform float zFightingPercentage;
 
-// temp
-in vec4 fragPosInLightSpace;
-
-
 Fragment getFragment() {
-    // Moving the origin to the center
-    vec2 st = (vs_st - vec2(0.5)) * 2.0;
+  // Moving the origin to the center
+  vec2 st = (vs_st - vec2(0.5)) * 2.0;
 
-    // The length of the texture coordinates vector is our distance from the center
-    float radius = length(st);
+  // The length of the texture coordinates vector is our distance from the center
+  float radius = length(st);
 
-    // We only want to consider ring-like objects so we need to discard everything else
-    if (radius > 1.0) {
-        discard;
-    }
+  // We only want to consider ring-like objects so we need to discard everything else
+  if (radius > 1.0) {
+    discard;
+  }
 
-    // Remapping the texture coordinates
-    // Radius \in [0,1],  texCoord \in [textureOffset.x, textureOffset.y]
-    // textureOffset.x -> 0
-    // textureOffset.y -> 1
-    float texCoord = (radius - textureOffset.x) / (textureOffset.y - textureOffset.x);
-    if (texCoord < 0.f || texCoord > 1.f) {
-        discard;
-    }
+  // Remapping the texture coordinates
+  // Radius \in [0,1],  texCoord \in [textureOffset.x, textureOffset.y]
+  // textureOffset.x -> 0
+  // textureOffset.y -> 1
+  float texCoord = (radius - textureOffset.x) / (textureOffset.y - textureOffset.x);
+  if (texCoord < 0.0 || texCoord > 1.0) {
+    discard;
+  }
 
-    vec4 colorBckwrd  = texture(ringTextureBckwrd, texCoord);
-    vec4 colorFwrd    = texture(ringTextureFwrd, texCoord);
-    vec4 colorMult    = texture(ringTextureColor, texCoord);
-    vec4 transparency = texture(ringTextureTransparency, texCoord);
+  vec4 colorBckwrd = texture(ringTextureBckwrd, texCoord);
+  vec4 colorFwrd = texture(ringTextureFwrd, texCoord);
+  vec4 colorMult = texture(ringTextureColor, texCoord);
+  vec4 transparency = texture(ringTextureTransparency, texCoord);
 
-    float lerpFactor =  dot(camPositionObj, sunPositionObj);
+  float lerpFactor = dot(camPositionObj, sunPositionObj);
 
-    // Jon Colors:
-    //vec4 diffuse = mix(colorFwrd * vec4(1, 0.88, 0.82, 1.0), colorBckwrd * vec4(1, 0.88, 0.82, 1.0), lerpFactor);
-    vec4 diffuse = mix(colorFwrd * colorMult, colorBckwrd * colorMult, lerpFactor);
-    diffuse.a =  colorFilterValue * transparency.a;
-    float colorValue = length(diffuse.rgb) / 0.57735026919;
-    if (colorValue < 0.1) {
-        discard;
-    }
+  // Jon Colors:
+  //vec4 diffuse = mix(colorFwrd * vec4(1, 0.88, 0.82, 1.0), colorBckwrd * vec4(1, 0.88, 0.82, 1.0), lerpFactor);
+  vec4 diffuse = mix(colorFwrd * colorMult, colorBckwrd * colorMult, lerpFactor);
+  diffuse.a = colorFilterValue * transparency.a;
+  float colorValue = length(diffuse.rgb) / 0.57735026919;
+  if (colorValue < 0.1) {
+    discard;
+  }
 
-    // shadow == 1.0 means it is not in shadow
-    float shadow = 1.0;
-    if (shadowCoords.z >= 0) {
-        vec4 normalizedShadowCoords = shadowCoords;
-        normalizedShadowCoords.z    = normalizeFloat(zFightingPercentage * normalizedShadowCoords.w);
-        normalizedShadowCoords.xy   = normalizedShadowCoords.xy / normalizedShadowCoords.w;
-        normalizedShadowCoords.w    = 1.0;
-        
-        float sum = 0;
-        #for i in 0..#{nShadowSamples}
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i}, -NSSamples + #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  0));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  NSSamples - #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               , -NSSamples + #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               ,  NSSamples - #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i}, -NSSamples + #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  0));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  NSSamples - #{i}));
-        #endfor
-        sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(0, 0));
-        shadow = clamp(sum / (8.0 * NSSamples + 1.f), 0.35, 1.0);
-    }
+  // shadow == 1.0 means it is not in shadow
+  float shadow = 1.0;
+  if (shadowCoords.z >= 0) {
+    vec4 normalizedShadowCoords = shadowCoords;
+    normalizedShadowCoords.z = normalizeFloat(zFightingPercentage * normalizedShadowCoords.w);
+    normalizedShadowCoords.xy = normalizedShadowCoords.xy / normalizedShadowCoords.w;
+    normalizedShadowCoords.w = 1.0;
+    
+    float sum = 0;
+    #for i in 0..#{nShadowSamples}
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i}, -NSSamples + #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  0));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  NSSamples - #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               , -NSSamples + #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               ,  NSSamples - #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i}, -NSSamples + #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  0));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  NSSamples - #{i}));
+    #endfor
+    sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(0, 0));
+    shadow = clamp(sum / (8.0 * NSSamples + 1.f), 0.35, 1.0);
+  }
 
-    // The normal for the one plane depends on whether we are dealing
-    // with a front facing or back facing fragment
-    vec3 normal;
-    // The plane is oriented on the xz plane
-    // WARNING: This might not be the case for Uranus
-    if (gl_FrontFacing) {
-        normal = vec3(-1.0, 0.0, 0.0);
-    }
-    else {
-        normal = vec3(1.0, 0.0, 0.0);
-    }
+  // The normal for the one plane depends on whether we are dealing
+  // with a front facing or back facing fragment
+  // The plane is oriented on the xz plane
+  // WARNING: This might not be the case for Uranus
+  vec3 normal = gl_FrontFacing ? vec3(-1.0, 0.0, 0.0) : vec3(1.0, 0.0, 0.0);
 
-    // Reduce the color of the fragment by the user factor
-    // if we are facing away from the Sun
-    if (dot(sunPosition, normal) < 0) {
-        diffuse.xyz = vec3(1.0, 0.97075, 0.952) * 
-                      texture(ringTextureUnlit, texCoord).xyz * 
-                      _nightFactor;
-    }
+  // Reduce the color of the fragment by the user factor
+  // if we are facing away from the Sun
+  if (dot(sunPosition, normal) < 0.0) {
+    diffuse.xyz = 
+      vec3(1.0, 0.97075, 0.952) *  texture(ringTextureUnlit, texCoord).xyz * nightFactor;
+  }
 
-    Fragment frag;
+  Fragment frag;
 
-    frag.color      = diffuse * shadow;
-    frag.depth      = vs_screenSpaceDepth;
-    frag.gPosition  = vec4(1e30, 1e30, 1e30, 1.0);
-    frag.gNormal    = vec4(normal, 1.0);
+  frag.color = diffuse * shadow;
+  frag.depth = vs_screenSpaceDepth;
+  frag.gPosition = vec4(1e30, 1e30, 1e30, 1.0);
+  frag.gNormal = vec4(normal, 1.0);
 
-    return frag;
+  return frag;
 }
diff --git a/modules/globebrowsing/shaders/advanced_rings_vs.glsl b/modules/globebrowsing/shaders/advanced_rings_vs.glsl
index 8b43a60571..5d58c668c9 100644
--- a/modules/globebrowsing/shaders/advanced_rings_vs.glsl
+++ b/modules/globebrowsing/shaders/advanced_rings_vs.glsl
@@ -31,7 +31,6 @@ layout(location = 1) in vec2 in_st;
 
 out vec2 vs_st;
 out float vs_screenSpaceDepth;
-out vec4 vs_positionViewSpace;
 out vec4 shadowCoords;
 
 uniform dmat4 modelViewProjectionMatrix;
@@ -42,12 +41,12 @@ uniform dmat4 modelViewProjectionMatrix;
 uniform dmat4 shadowMatrix;
 
 void main() {
-    vs_st = in_st;
+  vs_st = in_st;
 
-    dvec4 positionClipSpace  = modelViewProjectionMatrix * dvec4(in_position, 0.0, 1.0);
-    vec4 positionClipSpaceZNorm = z_normalization(vec4(positionClipSpace));
-    
-    shadowCoords = vec4(shadowMatrix * dvec4(in_position, 0.0, 1.0));
-    vs_screenSpaceDepth  = positionClipSpaceZNorm.w;
-    gl_Position = positionClipSpaceZNorm;
+  dvec4 positionClipSpace  = modelViewProjectionMatrix * dvec4(in_position, 0.0, 1.0);
+  vec4 positionClipSpaceZNorm = z_normalization(vec4(positionClipSpace));
+  
+  shadowCoords = vec4(shadowMatrix * dvec4(in_position, 0.0, 1.0));
+  vs_screenSpaceDepth  = positionClipSpaceZNorm.w;
+  gl_Position = positionClipSpaceZNorm;
 }
diff --git a/modules/globebrowsing/shaders/blending.hglsl b/modules/globebrowsing/shaders/blending.glsl
similarity index 56%
rename from modules/globebrowsing/shaders/blending.hglsl
rename to modules/globebrowsing/shaders/blending.glsl
index aff6b667d9..2456503c7a 100644
--- a/modules/globebrowsing/shaders/blending.hglsl
+++ b/modules/globebrowsing/shaders/blending.glsl
@@ -26,92 +26,91 @@
 #define BLENDING_HGLSL
 
 vec4 blendNormal(vec4 oldColor, vec4 newColor) {
-    vec4 toReturn;
-    toReturn.a = mix(oldColor.a, 1.0, newColor.a);
-    toReturn.rgb =
-        (newColor.rgb * newColor.a + oldColor.rgb * oldColor.a * (1 - newColor.a)) /
-        toReturn.a;
-    return toReturn;
+  vec4 toReturn;
+  toReturn.a = mix(oldColor.a, 1.0, newColor.a);
+  toReturn.rgb =
+    (newColor.rgb * newColor.a + oldColor.rgb * oldColor.a * (1 - newColor.a)) / toReturn.a;
+  return toReturn;
 }
 
 vec4 blendMultiply(vec4 oldColor, vec4 newColor) {
-    return oldColor * newColor;
+  return oldColor * newColor;
 }
 
 vec4 blendAdd(vec4 oldColor, vec4 newColor) {
-    return oldColor + newColor;
+  return oldColor + newColor;
 }
 
 vec4 blendSubtract(vec4 oldColor, vec4 newColor) {
-    return oldColor - newColor;
+  return oldColor - newColor;
 }
 
 vec3 hsl2rgb(in vec3 c) {
-    vec3 rgb = clamp(abs(mod(c.x * 6.0 + vec3(0.0, 4.0, 2.0), 6.0) - 3.0) - 1.0, 0.0, 1.0);
+  vec3 rgb = clamp(abs(mod(c.x * 6.0 + vec3(0.0, 4.0, 2.0), 6.0) - 3.0) - 1.0, 0.0, 1.0);
 
-    return c.z + c.y * (rgb - 0.5) * (1.0 - abs(2.0 * c.z - 1.0));
+  return c.z + c.y * (rgb - 0.5) * (1.0 - abs(2.0 * c.z - 1.0));
 }
 
 vec3 HueShift(in vec3 color, in float shift) {
-    vec3 P = vec3(0.55735) * dot(vec3(0.55735), color);
-    vec3 U = color - P;
-    vec3 V = cross(vec3(0.55735), U);
-    vec3 c = U * cos(shift*6.2832) + V * sin(shift*6.2832) + P;
-    return c;
+  vec3 P = vec3(0.55735) * dot(vec3(0.55735), color);
+  vec3 U = color - P;
+  vec3 V = cross(vec3(0.55735), U);
+  vec3 c = U * cos(shift*6.2832) + V * sin(shift*6.2832) + P;
+  return c;
 }
 
 vec3 rgb2hsl(in vec3 c) {
-    float r = c.r;
-    float g = c.g;
-    float b = c.b;
-    float cMin = min(r, min(g, b));
-    float cMax = max(r, max(g, b));
+  float r = c.r;
+  float g = c.g;
+  float b = c.b;
+  float cMin = min(r, min(g, b));
+  float cMax = max(r, max(g, b));
 
-    if (cMax > cMin) {
-        float l = (cMax + cMin) / 2.0;
+  if (cMax > cMin) {
+    float l = (cMax + cMin) / 2.0;
 
-        float cDelta = cMax - cMin;
+    float cDelta = cMax - cMin;
 
-        //s = l < .05 ? cDelta / ( cMax + cMin ) : cDelta / ( 2.0 - ( cMax + cMin ) ); Original
-        float s = (l < 0.0) ? cDelta / (cMax + cMin) : cDelta / (2.0 - (cMax + cMin));
+    //s = l < .05 ? cDelta / ( cMax + cMin ) : cDelta / ( 2.0 - ( cMax + cMin ) ); Original
+    float s = (l < 0.0) ? cDelta / (cMax + cMin) : cDelta / (2.0 - (cMax + cMin));
 
-        float h = 0.0;
-         if (r == cMax) {
-            h = (g - b) / cDelta;
-        }
-        else if (g == cMax) {
-            h = 2.0 + (b - r) / cDelta;
-        }
-        else {
-            h = 4.0 + (r - g) / cDelta;
-        }
-
-        if (h < 0.0) {
-            h += 6.0;
-        }
-        h = h / 6.0;
-
-        return vec3(h, s, l);
+    float h = 0.0;
+    if (r == cMax) {
+      h = (g - b) / cDelta;
+    }
+    else if (g == cMax) {
+      h = 2.0 + (b - r) / cDelta;
     }
     else {
-        return vec3(0.0);
+      h = 4.0 + (r - g) / cDelta;
     }
+
+    if (h < 0.0) {
+      h += 6.0;
+    }
+    h = h / 6.0;
+
+    return vec3(h, s, l);
+  }
+  else {
+    return vec3(0.0);
+  }
 }
 
 vec3 rgb2hsv(vec3 c) {
-    vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
-    vec4 p = (c.g < c.b) ? vec4(c.bg, K.wz) : vec4(c.gb, K.xy);
-    vec4 q = (c.r < p.x) ? vec4(p.xyw, c.r) : vec4(c.r, p.yzx);
+  vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
+  vec4 p = (c.g < c.b) ? vec4(c.bg, K.wz) : vec4(c.gb, K.xy);
+  vec4 q = (c.r < p.x) ? vec4(p.xyw, c.r) : vec4(c.r, p.yzx);
 
-    float d = q.x - min(q.w, q.y);
-    float e = 1.0e-10;
-    return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
+  float d = q.x - min(q.w, q.y);
+  float e = 1.0e-10;
+  return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
 }
 
 vec3 hsv2rgb(vec3 c) {
-    vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
-    vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
-    return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
+  vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
+  vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
+  return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
 }
 
-#endif
+#endif // BLENDING_HGLSL
diff --git a/modules/globebrowsing/shaders/globalrenderer_vs.glsl b/modules/globebrowsing/shaders/globalrenderer_vs.glsl
index 7f1755f19d..3d59c08d04 100644
--- a/modules/globebrowsing/shaders/globalrenderer_vs.glsl
+++ b/modules/globebrowsing/shaders/globalrenderer_vs.glsl
@@ -25,10 +25,10 @@
 #version __CONTEXT__
 
 #include "PowerScaling/powerScaling_vs.hglsl"
-#include <${MODULE_GLOBEBROWSING}/shaders/tile.hglsl>
-#include <${MODULE_GLOBEBROWSING}/shaders/texturetilemapping.hglsl>
-#include <${MODULE_GLOBEBROWSING}/shaders/tileheight.hglsl>
-#include <${MODULE_GLOBEBROWSING}/shaders/tilevertexskirt.hglsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/tile.glsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/texturetilemapping.glsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/tileheight.glsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/tilevertexskirt.glsl>
 
 layout(location = 1) in vec2 in_uv;
 
@@ -39,22 +39,22 @@ out vec3 levelWeights;
 out vec3 positionCameraSpace;
 
 #if USE_ACCURATE_NORMALS
-    out vec3 ellipsoidTangentThetaCameraSpace;
-    out vec3 ellipsoidTangentPhiCameraSpace;
+  out vec3 ellipsoidTangentThetaCameraSpace;
+  out vec3 ellipsoidTangentPhiCameraSpace;
 #endif // USE_ACCURATE_NORMALS
 
 #if USE_ECLIPSE_SHADOWS
-    out vec3 positionWorldSpace;
-    uniform dmat4 modelTransform;
-#endif
+  out vec3 positionWorldSpace;
+  uniform dmat4 modelTransform;
+#endif // USE_ECLIPSE_SHADOWS
 
 #if SHADOW_MAPPING_ENABLED
-    // ShadowMatrix is the matrix defined by:
-    // textureCoordsMatrix * projectionMatrix * combinedViewMatrix * modelMatrix
-    // where textureCoordsMatrix is just a scale and bias computation: [-1,1] to [0,1]
-    uniform dmat4 shadowMatrix;
-    out vec4 shadowCoords;
-#endif
+  // ShadowMatrix is the matrix defined by:
+  // textureCoordsMatrix * projectionMatrix * combinedViewMatrix * modelMatrix
+  // where textureCoordsMatrix is just a scale and bias computation: [-1,1] to [0,1]
+  uniform dmat4 shadowMatrix;
+  out vec4 shadowCoords;
+#endif // SHADOW_MAPPING_ENABLED
 
 uniform mat4 modelViewProjectionTransform;
 uniform mat4 modelViewTransform;
@@ -68,78 +68,77 @@ uniform float chunkMinHeight;
 uniform float distanceScaleFactor;
 uniform int chunkLevel;
 
-
 struct PositionNormalPair {
-    vec3 position;
-    vec3 normal;
+  vec3 position;
+  vec3 normal;
 };
 
 PositionNormalPair globalInterpolation(vec2 uv) {
-    vec2 lonlat = lonLatScalingFactor * uv + minLatLon;
+  vec2 lonlat = lonLatScalingFactor * uv + minLatLon;
 
-    // geodetic surface normal
-    float cosLat = cos(lonlat.y);
-    vec3 normal = vec3(cosLat * cos(lonlat.x), cosLat * sin(lonlat.x), sin(lonlat.y));
-    vec3 k = radiiSquared * normal;
-    float gamma = sqrt(dot(k, normal));
+  // geodetic surface normal
+  float cosLat = cos(lonlat.y);
+  vec3 normal = vec3(cosLat * cos(lonlat.x), cosLat * sin(lonlat.x), sin(lonlat.y));
+  vec3 k = radiiSquared * normal;
+  float gamma = sqrt(dot(k, normal));
 
-    PositionNormalPair result;
-    result.position = k / gamma;
-    result.normal = normal;
-    return result;
+  PositionNormalPair result;
+  result.position = k / gamma;
+  result.normal = normal;
+  return result;
 }
 
 vec3 getLevelWeights(float distToVertexOnEllipsoid) {
-    float projectedScaleFactor = distanceScaleFactor / distToVertexOnEllipsoid;
-    float desiredLevel = log2(projectedScaleFactor);
-    float levelInterp = chunkLevel - desiredLevel;
+  float projectedScaleFactor = distanceScaleFactor / distToVertexOnEllipsoid;
+  float desiredLevel = log2(projectedScaleFactor);
+  float levelInterp = chunkLevel - desiredLevel;
 
-    return vec3(
-        clamp(1.0 - levelInterp, 0.0, 1.0),
-        clamp(levelInterp, 0.0, 1.0) - clamp(levelInterp - 1.0, 0.0, 1.0),
-        clamp(levelInterp - 1.0, 0.0, 1.0)
-    );
+  return vec3(
+    clamp(1.0 - levelInterp, 0.0, 1.0),
+    clamp(levelInterp, 0.0, 1.0) - clamp(levelInterp - 1.0, 0.0, 1.0),
+    clamp(levelInterp - 1.0, 0.0, 1.0)
+  );
 }
 
 void main() {
-    PositionNormalPair pair = globalInterpolation(in_uv);
-    float distToVertexOnEllipsoid = length((pair.normal * chunkMinHeight + pair.position) - cameraPosition);
+  PositionNormalPair pair = globalInterpolation(in_uv);
+  float distToVertexOnEllipsoid = length((pair.normal * chunkMinHeight + pair.position) - cameraPosition);
 
-    // use level weight for height sampling, and output to fragment shader
-    levelWeights = getLevelWeights(distToVertexOnEllipsoid);
+  // use level weight for height sampling, and output to fragment shader
+  levelWeights = getLevelWeights(distToVertexOnEllipsoid);
 
-    // Get the height value and apply skirts
-    float height = getTileHeight(in_uv, levelWeights)  - getTileVertexSkirtLength();
+  // Get the height value and apply skirts
+  float height = getTileHeight(in_uv, levelWeights)  - getTileVertexSkirtLength();
 
 #if USE_ACCURATE_NORMALS
-    // Calculate tangents
-    // tileDelta is a step length (epsilon). Should be small enough for accuracy but not
-    // Too small for precision. 1 / 512 is good.
-    const float tileDelta = 1.0 / 512.0;
-    PositionNormalPair pair10 = globalInterpolation(vec2(1.0, 0.0) * tileDelta + in_uv);
-    PositionNormalPair pair01 = globalInterpolation(vec2(0.0, 1.0) * tileDelta + in_uv);
-    vec3 ellipsoidTangentTheta = normalize(pair10.position - pair.position);
-    vec3 ellipsoidTangentPhi = normalize(pair01.position - pair.position);
-    ellipsoidTangentThetaCameraSpace = mat3(modelViewTransform) * ellipsoidTangentTheta;
-    ellipsoidTangentPhiCameraSpace = mat3(modelViewTransform) * ellipsoidTangentPhi;
+  // Calculate tangents
+  // tileDelta is a step length (epsilon). Should be small enough for accuracy but not
+  // Too small for precision. 1 / 512 is good.
+  const float tileDelta = 1.0 / 512.0;
+  PositionNormalPair pair10 = globalInterpolation(vec2(1.0, 0.0) * tileDelta + in_uv);
+  PositionNormalPair pair01 = globalInterpolation(vec2(0.0, 1.0) * tileDelta + in_uv);
+  vec3 ellipsoidTangentTheta = normalize(pair10.position - pair.position);
+  vec3 ellipsoidTangentPhi = normalize(pair01.position - pair.position);
+  ellipsoidTangentThetaCameraSpace = mat3(modelViewTransform) * ellipsoidTangentTheta;
+  ellipsoidTangentPhiCameraSpace = mat3(modelViewTransform) * ellipsoidTangentPhi;
 #endif // USE_ACCURATE_NORMALS
 
-    // Add the height in the direction of the normal
-    pair.position = pair.normal * height + pair.position;
-    vec4 positionClippingSpace = modelViewProjectionTransform * vec4(pair.position, 1.0);
+  // Add the height in the direction of the normal
+  pair.position = pair.normal * height + pair.position;
+  vec4 positionClippingSpace = modelViewProjectionTransform * vec4(pair.position, 1.0);
 
-    // Write output
-    fs_uv = in_uv;
-    fs_position = z_normalization(positionClippingSpace);
-    gl_Position = fs_position;
-    ellipsoidNormalCameraSpace = mat3(modelViewTransform) * pair.normal;
-    positionCameraSpace = vec3(modelViewTransform * vec4(pair.position, 1.0));
+  // Write output
+  fs_uv = in_uv;
+  fs_position = z_normalization(positionClippingSpace);
+  gl_Position = fs_position;
+  ellipsoidNormalCameraSpace = mat3(modelViewTransform) * pair.normal;
+  positionCameraSpace = vec3(modelViewTransform * vec4(pair.position, 1.0));
 
 #if USE_ECLIPSE_SHADOWS
-    positionWorldSpace = vec3(modelTransform * dvec4(pair.position, 1.0));
-#endif
+  positionWorldSpace = vec3(modelTransform * dvec4(pair.position, 1.0));
+#endif // USE_ECLIPSE_SHADOWS
 
 #if SHADOW_MAPPING_ENABLED
-    shadowCoords = vec4(shadowMatrix * dvec4(pair.position, 1.0));
-#endif
+  shadowCoords = vec4(shadowMatrix * dvec4(pair.position, 1.0));
+#endif // SHADOW_MAPPING_ENABLED
 }
diff --git a/modules/globebrowsing/shaders/localrenderer_vs.glsl b/modules/globebrowsing/shaders/localrenderer_vs.glsl
index 5c1439139d..642a2a2ae4 100644
--- a/modules/globebrowsing/shaders/localrenderer_vs.glsl
+++ b/modules/globebrowsing/shaders/localrenderer_vs.glsl
@@ -25,10 +25,10 @@
 #version __CONTEXT__
 
 #include "PowerScaling/powerScaling_vs.hglsl"
-#include <${MODULE_GLOBEBROWSING}/shaders/tile.hglsl>
-#include <${MODULE_GLOBEBROWSING}/shaders/texturetilemapping.hglsl>
-#include <${MODULE_GLOBEBROWSING}/shaders/tileheight.hglsl>
-#include <${MODULE_GLOBEBROWSING}/shaders/tilevertexskirt.hglsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/tile.glsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/texturetilemapping.glsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/tileheight.glsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/tilevertexskirt.glsl>
 
 layout(location = 1) in vec2 in_uv;
 
@@ -39,22 +39,22 @@ out vec3 levelWeights;
 out vec3 positionCameraSpace;
 
 #if USE_ACCURATE_NORMALS
-    out vec3 ellipsoidTangentThetaCameraSpace;
-    out vec3 ellipsoidTangentPhiCameraSpace;
+  out vec3 ellipsoidTangentThetaCameraSpace;
+  out vec3 ellipsoidTangentPhiCameraSpace;
 #endif // USE_ACCURATE_NORMALS
 
 #if USE_ECLIPSE_SHADOWS
 out vec3 positionWorldSpace;
 uniform dmat4 inverseViewTransform;
-#endif
+#endif // USE_ECLIPSE_SHADOWS
 
 #if SHADOW_MAPPING_ENABLED
-    // ShadowMatrix is the matrix defined by:
-    // textureCoordsMatrix * projectionMatrix * combinedViewMatrix * modelMatrix
-    // where textureCoordsMatrix is just a scale and bias computation: [-1,1] to [0,1]
-    uniform dmat4 shadowMatrix;
-    out vec4 shadowCoords;
-#endif
+  // ShadowMatrix is the matrix defined by:
+  // textureCoordsMatrix * projectionMatrix * combinedViewMatrix * modelMatrix
+  // where textureCoordsMatrix is just a scale and bias computation: [-1,1] to [0,1]
+  uniform dmat4 shadowMatrix;
+  out vec4 shadowCoords;
+#endif // SHADOW_MAPPING_ENABLED
 
 uniform mat4 projectionTransform;
 // Input points in camera space
@@ -69,60 +69,60 @@ uniform float distanceScaleFactor;
 uniform int chunkLevel;
 
 vec3 bilinearInterpolation(vec2 uv) {
-    vec3 p0 = mix(p00, p10, uv.x);
-    vec3 p1 = mix(p01, p11, uv.x);
-    return mix(p0, p1, uv.y);
+  vec3 p0 = mix(p00, p10, uv.x);
+  vec3 p1 = mix(p01, p11, uv.x);
+  return mix(p0, p1, uv.y);
 }
 
 vec3 getLevelWeights(float distToVertexOnEllipsoid) {
-    float projectedScaleFactor = distanceScaleFactor / distToVertexOnEllipsoid;
-    float desiredLevel = log2(projectedScaleFactor);
-    float levelInterp = chunkLevel - desiredLevel;
+  float projectedScaleFactor = distanceScaleFactor / distToVertexOnEllipsoid;
+  float desiredLevel = log2(projectedScaleFactor);
+  float levelInterp = chunkLevel - desiredLevel;
 
-    return vec3(
-        clamp(1.0 - levelInterp, 0.0, 1.0),
-        clamp(levelInterp, 0.0, 1.0) - clamp(levelInterp - 1.0, 0.0, 1.0),
-        clamp(levelInterp - 1.0, 0.0, 1.0)
-    );
+  return vec3(
+    clamp(1.0 - levelInterp, 0.0, 1.0),
+    clamp(levelInterp, 0.0, 1.0) - clamp(levelInterp - 1.0, 0.0, 1.0),
+    clamp(levelInterp - 1.0, 0.0, 1.0)
+  );
 }
 
 void main() {
-    // Position in cameraspace
-    vec3 p = bilinearInterpolation(in_uv);
-    
-    // Calculate desired level based on distance to the vertex on the ellipsoid
-    // Before any heightmapping is done
-    float distToVertexOnEllipsoid = length(p + patchNormalCameraSpace * chunkMinHeight);
+  // Position in cameraspace
+  vec3 p = bilinearInterpolation(in_uv);
+  
+  // Calculate desired level based on distance to the vertex on the ellipsoid
+  // Before any heightmapping is done
+  float distToVertexOnEllipsoid = length(p + patchNormalCameraSpace * chunkMinHeight);
 
-    // use level weight for height sampling, and output to fragment shader
-    levelWeights = getLevelWeights(distToVertexOnEllipsoid);
+  // use level weight for height sampling, and output to fragment shader
+  levelWeights = getLevelWeights(distToVertexOnEllipsoid);
 
-    // Get the height value and apply skirts
-    float height = getTileHeightScaled(in_uv, levelWeights) - getTileVertexSkirtLength();
-    
-    // Translate the point along normal
-    p += patchNormalCameraSpace * height;
+  // Get the height value and apply skirts
+  float height = getTileHeightScaled(in_uv, levelWeights) - getTileVertexSkirtLength();
+  
+  // Translate the point along normal
+  p += patchNormalCameraSpace * height;
 
-    vec4 positionClippingSpace = projectionTransform * vec4(p, 1);
+  vec4 positionClippingSpace = projectionTransform * vec4(p, 1);
 
 #if USE_ACCURATE_NORMALS
-    // Calculate tangents
-    ellipsoidTangentThetaCameraSpace = normalize(p10 - p00);
-    ellipsoidTangentPhiCameraSpace = normalize(p01 - p00);
+  // Calculate tangents
+  ellipsoidTangentThetaCameraSpace = normalize(p10 - p00);
+  ellipsoidTangentPhiCameraSpace = normalize(p01 - p00);
 #endif // USE_ACCURATE_NORMALS
 
-    // Write output
-    fs_uv = in_uv;
-    fs_position = z_normalization(positionClippingSpace);
-    gl_Position = fs_position;
-    ellipsoidNormalCameraSpace = patchNormalCameraSpace;
-    positionCameraSpace = p;
+  // Write output
+  fs_uv = in_uv;
+  fs_position = z_normalization(positionClippingSpace);
+  gl_Position = fs_position;
+  ellipsoidNormalCameraSpace = patchNormalCameraSpace;
+  positionCameraSpace = p;
 
 #if USE_ECLIPSE_SHADOWS
-    positionWorldSpace = vec3(inverseViewTransform * dvec4(p, 1.0));
-#endif
+  positionWorldSpace = vec3(inverseViewTransform * dvec4(p, 1.0));
+#endif // USE_ECLIPSE_SHADOWS
 
 #if SHADOW_MAPPING_ENABLED
-    shadowCoords = vec4(shadowMatrix * dvec4(p, 1.0));
-#endif
+  shadowCoords = vec4(shadowMatrix * dvec4(p, 1.0));
+#endif // SHADOW_MAPPING_ENABLED
 }
diff --git a/modules/globebrowsing/shaders/renderer_fs.glsl b/modules/globebrowsing/shaders/renderer_fs.glsl
index 07ba765e6c..c02fe78d19 100644
--- a/modules/globebrowsing/shaders/renderer_fs.glsl
+++ b/modules/globebrowsing/shaders/renderer_fs.glsl
@@ -24,9 +24,9 @@
 
 #include "fragment.glsl"
 
-#include <${MODULE_GLOBEBROWSING}/shaders/tile.hglsl>
-#include <${MODULE_GLOBEBROWSING}/shaders/texturetilemapping.hglsl>
-#include <${MODULE_GLOBEBROWSING}/shaders/tileheight.hglsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/tile.glsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/texturetilemapping.glsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/tileheight.glsl>
 #include "PowerScaling/powerScaling_fs.hglsl"
 
 // Below are all the tiles that are used for contributing the actual fragment color
@@ -49,15 +49,13 @@ uniform Layer WaterMasks[NUMLAYERS_WATERMASK];
 
 #if SHOW_HEIGHT_RESOLUTION
 uniform vec2 vertexResolution;
-#endif
+#endif // SHOW_HEIGHT_RESOLUTION
 
-//#if USE_NIGHTTEXTURE || USE_WATERMASK || PERFORM_SHADING
 uniform vec3 lightDirectionCameraSpace;
-//#endif
 
 #if PERFORM_SHADING
 uniform float orenNayarRoughness;
-#endif
+#endif // PERFORM_SHADING
 
 #if SHADOW_MAPPING_ENABLED
 
@@ -67,23 +65,22 @@ uniform float orenNayarRoughness;
 in vec4 shadowCoords;
 uniform sampler2DShadow shadowMapTexture;
 uniform float zFightingPercentage;
-#endif
+#endif // SHADOW_MAPPING_ENABLED
 
 #if USE_ECLIPSE_SHADOWS
 
-
 #define NSEclipseShadowsMinusOne #{nEclipseShadows}
 #define NSEclipseShadows (NSEclipseShadowsMinusOne + 1)
 
 /*******************************************************************************
-    ***** ALL CALCULATIONS FOR ECLIPSE ARE IN METERS AND IN WORLD SPACE SYSTEM ****
-    *******************************************************************************/
+ ***** ALL CALCULATIONS FOR ECLIPSE ARE IN METERS AND IN WORLD SPACE SYSTEM ****
+ *******************************************************************************/
 struct ShadowRenderingStruct {
-    double xu, xp;
-    double rs, rc;
-    dvec3 sourceCasterVec;
-    dvec3 casterPositionVec;
-    bool isShadowing;
+  double xu, xp;
+  double rs, rc;
+  dvec3 sourceCasterVec;
+  dvec3 casterPositionVec;
+  bool isShadowing;
 };
 
 // Eclipse shadow data
@@ -96,48 +93,46 @@ uniform bool hardShadows;
 vec4 calcShadow(const ShadowRenderingStruct shadowInfoArray[NSEclipseShadows],
                 const dvec3 position, const bool ground)
 {
-    #for i in 0..#{nEclipseShadows}
-        if (shadowInfoArray[#{i}].isShadowing) {
-            dvec3 pc = shadowInfoArray[#{i}].casterPositionVec - position;
-            dvec3 sc_norm = shadowInfoArray[#{i}].sourceCasterVec;
-            dvec3 pc_proj = dot(pc, sc_norm) * sc_norm;
-            dvec3 d = pc - pc_proj;
+  #for i in 0..#{nEclipseShadows}
+    if (shadowInfoArray[#{i}].isShadowing) {
+      dvec3 pc = shadowInfoArray[#{i}].casterPositionVec - position;
+      dvec3 sc_norm = shadowInfoArray[#{i}].sourceCasterVec;
+      dvec3 pc_proj = dot(pc, sc_norm) * sc_norm;
+      dvec3 d = pc - pc_proj;
 
+      float length_d = float(length(d));
+      double length_pc_proj = length(pc_proj);
 
-            float length_d = float(length(d));
-            double length_pc_proj = length(pc_proj);
+      float r_p_pi = float(shadowInfoArray[#{i}].rc * (length_pc_proj + shadowInfoArray[#{i}].xp) / shadowInfoArray[#{i}].xp);
+      float r_u_pi = float(shadowInfoArray[#{i}].rc * (shadowInfoArray[#{i}].xu - length_pc_proj) / shadowInfoArray[#{i}].xu);
 
-            float r_p_pi = float(shadowInfoArray[#{i}].rc * (length_pc_proj + shadowInfoArray[#{i}].xp) / shadowInfoArray[#{i}].xp);
-            float r_u_pi = float(shadowInfoArray[#{i}].rc * (shadowInfoArray[#{i}].xu - length_pc_proj) / shadowInfoArray[#{i}].xu);
-
-            if (length_d < r_u_pi) { // umbra
-                if (ground) {
-    #if USE_ECLIPSE_HARD_SHADOWS
-                    return vec4(0.2, 0.2, 0.2, 1.0);
-    #else
-                    // butterworthFunc
-                    return vec4(vec3(sqrt(r_u_pi / (r_u_pi + pow(length_d, 2.0)))), 1.0);
-    #endif
-                }
-                else {
-    #if USE_ECLIPSE_HARD_SHADOWS
-                    return vec4(0.5, 0.5, 0.5, 1.0);
-    #else
-                    return vec4(vec3(length_d / r_p_pi), 1.0);
-    #endif
-                }
-            }
-            else if (length_d < r_p_pi) {// penumbra
-    #if USE_ECLIPSE_HARD_SHADOWS
-                return vec4(0.5, 0.5, 0.5, 1.0); 
-    #else
-                return vec4(vec3(length_d / r_p_pi), 1.0);
-    #endif
-            }
+      if (length_d < r_u_pi) { // umbra
+        if (ground) {
+#if USE_ECLIPSE_HARD_SHADOWS
+          return vec4(0.2, 0.2, 0.2, 1.0);
+#else
+          // butterworthFunc
+          return vec4(vec3(sqrt(r_u_pi / (r_u_pi + pow(length_d, 2.0)))), 1.0);
+#endif
         }
-
-    #endfor
-    return vec4(1.0);
+        else {
+#if USE_ECLIPSE_HARD_SHADOWS
+          return vec4(0.5, 0.5, 0.5, 1.0);
+#else
+          return vec4(vec3(length_d / r_p_pi), 1.0);
+#endif
+        }
+      }
+      else if (length_d < r_p_pi) {// penumbra
+#if USE_ECLIPSE_HARD_SHADOWS
+        return vec4(0.5, 0.5, 0.5, 1.0); 
+#else
+        return vec4(vec3(length_d / r_p_pi), 1.0);
+#endif
+      }
+    }
+  #endfor
+  return vec4(1.0);
 }
 #endif
 
@@ -148,8 +143,8 @@ in vec3 levelWeights;
 in vec3 positionCameraSpace;
 
 #if USE_ACCURATE_NORMALS
-    in vec3 ellipsoidTangentThetaCameraSpace;
-    in vec3 ellipsoidTangentPhiCameraSpace;
+  in vec3 ellipsoidTangentThetaCameraSpace;
+  in vec3 ellipsoidTangentPhiCameraSpace;
 #endif // USE_ACCURATE_NORMALS
 
 #if USE_ECLIPSE_SHADOWS
@@ -158,146 +153,142 @@ in vec3 positionWorldSpace;
 
 uniform float opacity;
 
-
 Fragment getFragment() {
-    Fragment frag;
-    frag.color = vec4(0.3, 0.3, 0.3, 1.0);
+  Fragment frag;
+  frag.color = vec4(0.3, 0.3, 0.3, 1.0);
 
-    vec3 normal = normalize(ellipsoidNormalCameraSpace);
+  vec3 normal = normalize(ellipsoidNormalCameraSpace);
 
 #if USE_ACCURATE_NORMALS
-    normal = getTileNormal(
-        fs_uv,
-        levelWeights,
-        normalize(ellipsoidNormalCameraSpace),
-        normalize(ellipsoidTangentThetaCameraSpace),
-        normalize(ellipsoidTangentPhiCameraSpace)
-    );
+  normal = getTileNormal(
+    fs_uv,
+    levelWeights,
+    normalize(ellipsoidNormalCameraSpace),
+    normalize(ellipsoidTangentThetaCameraSpace),
+    normalize(ellipsoidTangentPhiCameraSpace)
+  );
 #endif /// USE_ACCURATE_NORMALS
 
 #if USE_COLORTEXTURE
-    frag.color = calculateColor(frag.color, fs_uv, levelWeights, ColorLayers);
+  frag.color = calculateColor(frag.color, fs_uv, levelWeights, ColorLayers);
 #endif // USE_COLORTEXTURE
 
 #if USE_WATERMASK
-    float waterReflectance = 0.0;
-    frag.color = calculateWater(
-        frag.color,
-        fs_uv,
-        levelWeights,
-        WaterMasks,
-        normal,
-        lightDirectionCameraSpace, // Should already be normalized
-        positionCameraSpace,
-        waterReflectance
-    );
-
+  float waterReflectance = 0.0;
+  frag.color = calculateWater(
+    frag.color,
+    fs_uv,
+    levelWeights,
+    WaterMasks,
+    normal,
+    lightDirectionCameraSpace, // Should already be normalized
+    positionCameraSpace,
+    waterReflectance
+  );
 #endif // USE_WATERMASK
 
 #if USE_NIGHTTEXTURE
-    frag.color = calculateNight(
-        frag.color,
-        fs_uv,
-        levelWeights,
-        NightLayers,
-        normalize(ellipsoidNormalCameraSpace),
-        lightDirectionCameraSpace // Should already be normalized
-    );
-
+  frag.color = calculateNight(
+    frag.color,
+    fs_uv,
+    levelWeights,
+    NightLayers,
+    normalize(ellipsoidNormalCameraSpace),
+    lightDirectionCameraSpace // Should already be normalized
+  );
 #endif // USE_NIGHTTEXTURE
 
 #if PERFORM_SHADING
-    frag.color = calculateShadedColor(
-        frag.color,
-        normal,
-        lightDirectionCameraSpace,
-        normalize(positionCameraSpace),
-        orenNayarRoughness
-    );
+  frag.color = calculateShadedColor(
+    frag.color,
+    normal,
+    lightDirectionCameraSpace,
+    normalize(positionCameraSpace),
+    orenNayarRoughness
+  );
 #endif // PERFORM_SHADING
 
 #if USE_ECLIPSE_SHADOWS
-    frag.color *= calcShadow(shadowDataArray, dvec3(positionWorldSpace), true);
-#endif
+  frag.color *= calcShadow(shadowDataArray, dvec3(positionWorldSpace), true);
+#endif // USE_ECLIPSE_SHADOWS
 
 #if USE_OVERLAY
-    frag.color = calculateOverlay(frag.color, fs_uv, levelWeights, Overlays);
+  frag.color = calculateOverlay(frag.color, fs_uv, levelWeights, Overlays);
 #endif // USE_OVERLAY
 
 #if SHOW_HEIGHT_INTENSITIES
-    frag.color.rgb *= vec3(0.1);
+  frag.color.rgb *= vec3(0.1);
 
-    float untransformedHeight = getUntransformedTileVertexHeight(fs_uv, levelWeights);
-    float contourLine = fract(10.0 * untransformedHeight) > 0.98 ? 1.0 : 0.0;
-    frag.color.r += untransformedHeight;
-    frag.color.b = contourLine;
-#endif
+  float untransformedHeight = getUntransformedTileVertexHeight(fs_uv, levelWeights);
+  float contourLine = fract(10.0 * untransformedHeight) > 0.98 ? 1.0 : 0.0;
+  frag.color.r += untransformedHeight;
+  frag.color.b = contourLine;
+#endif // SHOW_HEIGHT_INTENSITIES
 
 #if SHOW_HEIGHT_RESOLUTION
-    frag.color += 0.0001 * calculateDebugColor(fs_uv, fs_position, vertexResolution);
-    #if USE_HEIGHTMAP
-        frag.color.r = min(frag.color.r, 0.8);
-        frag.color.r += tileResolution(fs_uv, HeightLayers[0].pile.chunkTile0) > 0.9 ? 1 : 0;
-    #endif
-#endif
+  frag.color += 0.0001 * calculateDebugColor(fs_uv, fs_position, vertexResolution);
+  #if USE_HEIGHTMAP
+    frag.color.r = min(frag.color.r, 0.8);
+    frag.color.r += tileResolution(fs_uv, HeightLayers[0].pile.chunkTile0) > 0.9 ? 1 : 0;
+  #endif // USE_HEIGHTMAP
+#endif // SHOW_HEIGHT_RESOLUTION
 
-    // Other data
+  // Other data
 #if USE_WATERMASK
-    // Water reflectance is added to the G-Buffer.
-    frag.gNormal.w = waterReflectance;
+  // Water reflectance is added to the G-Buffer.
+  frag.gNormal.w = waterReflectance;
 #else
-    frag.gNormal.w = 0.0;
+  frag.gNormal.w = 0.0;
 #endif
-    // Normal is written View Space (Including SGCT View Matrix).
-    frag.gNormal.xyz = normal;
+  // Normal is written View Space (Including SGCT View Matrix).
+  frag.gNormal.xyz = normal;
 
-    if (dot(positionCameraSpace, vec3(1.0)) != 0.0) {
-        frag.gPosition   = vec4(positionCameraSpace, 1.0); // in Camera Rig Space
-    }
-    else {
-        frag.gPosition   = vec4(1.0); // in Camera Rig Space
-    }
+  if (dot(positionCameraSpace, vec3(1.0)) != 0.0) {
+    frag.gPosition = vec4(positionCameraSpace, 1.0); // in Camera Rig Space
+  }
+  else {
+    frag.gPosition = vec4(1.0); // in Camera Rig Space
+  }
 
-    frag.depth = fs_position.w;
+  frag.depth = fs_position.w;
 
 #if SHOW_CHUNK_EDGES
-    const float BorderSize = 0.005;
-    const vec3 BorderColor = vec3(1.0, 0.0, 0.0);
+  const float BorderSize = 0.005;
+  const vec3 BorderColor = vec3(1.0, 0.0, 0.0);
 
-    vec2 uvOffset = fs_uv - vec2(0.5);
-    float thres = 0.5 - BorderSize * 0.5;
-    bool isBorder = abs(uvOffset.x) > thres || abs(uvOffset.y) > thres;
-    if (isBorder) {
-        frag.color.rgb += BorderColor;
-    }
+  vec2 uvOffset = fs_uv - vec2(0.5);
+  float thres = 0.5 - BorderSize * 0.5;
+  bool isBorder = abs(uvOffset.x) > thres || abs(uvOffset.y) > thres;
+  if (isBorder) {
+    frag.color.rgb += BorderColor;
+  }
 #endif // SHOW_CHUNK_EDGES
 
 #if SHADOW_MAPPING_ENABLED
-    float shadow = 1.0;
-    if (shadowCoords.w > 1) {
-        vec4 normalizedShadowCoords = shadowCoords;
-        normalizedShadowCoords.z    = normalizeFloat(zFightingPercentage * normalizedShadowCoords.w);
-        normalizedShadowCoords.xy   = normalizedShadowCoords.xy / normalizedShadowCoords.w;
-        normalizedShadowCoords.w    = 1.0;
+  float shadow = 1.0;
+  if (shadowCoords.w > 1) {
+    vec4 normalizedShadowCoords = shadowCoords;
+    normalizedShadowCoords.z    = normalizeFloat(zFightingPercentage * normalizedShadowCoords.w);
+    normalizedShadowCoords.xy   = normalizedShadowCoords.xy / normalizedShadowCoords.w;
+    normalizedShadowCoords.w    = 1.0;
 
-        float sum = 0;
-        #for i in 0..#{nShadowSamples}
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i}, -NSSamples + #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  0));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  NSSamples - #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               , -NSSamples + #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               ,  NSSamples - #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i}, -NSSamples + #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  0));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  NSSamples - #{i}));
-        #endfor
-        sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(0, 0));
-        shadow = sum / (8.0 * NSSamples + 1.f);
-    }
-    frag.color.xyz *= shadow < 0.99 ? clamp(shadow + 0.3, 0.0, 1.0) : shadow;
+    float sum = 0;
+    #for i in 0..#{nShadowSamples}
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i}, -NSSamples + #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  0));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  NSSamples - #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               , -NSSamples + #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               ,  NSSamples - #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i}, -NSSamples + #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  0));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  NSSamples - #{i}));
+    #endfor
+    sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(0, 0));
+    shadow = sum / (8.0 * NSSamples + 1.f);
+  }
+  frag.color.xyz *= shadow < 0.99 ? clamp(shadow + 0.3, 0.0, 1.0) : shadow;
 #endif
 
-    frag.color.a *= opacity;
-
-    return frag;
+  frag.color.a *= opacity;
+  return frag;
 }
diff --git a/modules/globebrowsing/shaders/rings_fs.glsl b/modules/globebrowsing/shaders/rings_fs.glsl
index d3fb2bc9e4..128ac8b687 100644
--- a/modules/globebrowsing/shaders/rings_fs.glsl
+++ b/modules/globebrowsing/shaders/rings_fs.glsl
@@ -38,91 +38,82 @@ uniform vec2 textureOffset;
 uniform float colorFilterValue;
 
 uniform vec3 sunPosition;
-uniform float _nightFactor;
+uniform float nightFactor;
 uniform float zFightingPercentage;
 
-// temp
-in vec4 fragPosInLightSpace;
-
-
 Fragment getFragment() {
-    // Moving the origin to the center
-    vec2 st = (vs_st - vec2(0.5)) * 2.0;
+  // Moving the origin to the center
+  vec2 st = (vs_st - vec2(0.5)) * 2.0;
 
-    // The length of the texture coordinates vector is our distance from the center
-    float radius = length(st);
+  // The length of the texture coordinates vector is our distance from the center
+  float radius = length(st);
 
-    // We only want to consider ring-like objects so we need to discard everything else
-    if (radius > 1.0) {
-        discard;
+  // We only want to consider ring-like objects so we need to discard everything else
+  if (radius > 1.0) {
+    discard;
+  }
+
+  // Remapping the texture coordinates
+  // Radius \in [0,1],  texCoord \in [textureOffset.x, textureOffset.y]
+  // textureOffset.x -> 0
+  // textureOffset.y -> 1
+  float texCoord = (radius - textureOffset.x) / (textureOffset.y - textureOffset.x);
+  if (texCoord < 0.0 || texCoord > 1.0) {
+    discard;
+  }
+
+  vec4 diffuse = texture(ringTexture, 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]
+  float colorValue = length(diffuse.rgb) / 3.0;
+  if (colorValue < colorFilterValue) {
+    diffuse.a = colorValue * colorFilterValue;
+    if (diffuse.a < 0.65) {
+      discard;
     }
-
-    // Remapping the texture coordinates
-    // Radius \in [0,1],  texCoord \in [textureOffset.x, textureOffset.y]
-    // textureOffset.x -> 0
-    // textureOffset.y -> 1
-    float texCoord = (radius - textureOffset.x) / (textureOffset.y - textureOffset.x);
-    if (texCoord < 0.f || texCoord > 1.f) {
-        discard;
-    }
-
-    vec4 diffuse = texture(ringTexture, 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]
-    float colorValue = length(diffuse.rgb) / 3.0;
-    if (colorValue < colorFilterValue) {
-        diffuse.a = colorValue * colorFilterValue;
-        if (diffuse.a < 0.65)
-            discard;
-    }
-
-    // shadow == 1.0 means it is not in shadow
-    float shadow = 1.0;
-    if (shadowCoords.z >= 0) {
-        vec4 normalizedShadowCoords = shadowCoords;
-        normalizedShadowCoords.z    = normalizeFloat(zFightingPercentage * normalizedShadowCoords.w);
-        normalizedShadowCoords.xy   = normalizedShadowCoords.xy / normalizedShadowCoords.w;
-        normalizedShadowCoords.w    = 1.0;
-        
-        float sum = 0;
-        #for i in 0..#{nShadowSamples}
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i}, -NSSamples + #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  0));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  NSSamples - #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               , -NSSamples + #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               ,  NSSamples - #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i}, -NSSamples + #{i}));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  0));
-            sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  NSSamples - #{i}));
-        #endfor
-        sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(0, 0));
-        shadow = clamp(sum / (8.0 * NSSamples + 1.f), 0.35, 1.0);
-    }
-
-    // The normal for the one plane depends on whether we are dealing
-    // with a front facing or back facing fragment
-    vec3 normal;
-    // The plane is oriented on the xz plane
-    // WARNING: This might not be the case for Uranus
-    if (gl_FrontFacing) {
-        normal = vec3(-1.0, 0.0, 0.0);
-    }
-    else {
-        normal = vec3(1.0, 0.0, 0.0);
-    }
-
-    // Reduce the color of the fragment by the user factor
-    // if we are facing away from the Sun
-    if (dot(sunPosition, normal) < 0) {
-        diffuse.xyz *= _nightFactor;
-    }
-
-    Fragment frag;
-
-    frag.color      = diffuse * shadow;
-    frag.depth      = vs_screenSpaceDepth;
-    frag.gPosition  = vec4(1e30, 1e30, 1e30, 1.0);
-    frag.gNormal    = vec4(normal, 1.0);
-
-    return frag;
+}
+
+  // shadow == 1.0 means it is not in shadow
+  float shadow = 1.0;
+  if (shadowCoords.z >= 0) {
+    vec4 normalizedShadowCoords = shadowCoords;
+    normalizedShadowCoords.z = normalizeFloat(zFightingPercentage * normalizedShadowCoords.w);
+    normalizedShadowCoords.xy = normalizedShadowCoords.xy / normalizedShadowCoords.w;
+    normalizedShadowCoords.w = 1.0;
+    
+    float sum = 0;
+    #for i in 0..#{nShadowSamples}
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i}, -NSSamples + #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  0));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(-NSSamples + #{i},  NSSamples - #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               , -NSSamples + #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( 0               ,  NSSamples - #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i}, -NSSamples + #{i}));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  0));
+      sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2( NSSamples - #{i},  NSSamples - #{i}));
+    #endfor
+    sum += textureProjOffset(shadowMapTexture, normalizedShadowCoords, ivec2(0, 0));
+    shadow = clamp(sum / (8.0 * NSSamples + 1.0), 0.35, 1.0);
+  }
+
+  // The normal for the one plane depends on whether we are dealing
+  // with a front facing or back facing fragment
+  // The plane is oriented on the xz plane
+  // WARNING: This might not be the case for Uranus
+  vec3 normal = gl_FrontFacing ? vec3(-1.0, 0.0, 0.0) : vec3(1.0, 0.0, 0.0);
+
+  // Reduce the color of the fragment by the user factor
+  // if we are facing away from the Sun
+  if (dot(sunPosition, normal) < 0.0) {
+    diffuse.xyz *= _nightFactor;
+  }
+
+  Fragment frag;
+
+  frag.color = diffuse * shadow;
+  frag.depth = vs_screenSpaceDepth;
+  frag.gPosition = vec4(1e30, 1e30, 1e30, 1.0);
+  frag.gNormal = vec4(normal, 1.0);
+
+  return frag;
 }
diff --git a/modules/globebrowsing/shaders/rings_geom_fs.glsl b/modules/globebrowsing/shaders/rings_geom_fs.glsl
index 6d2126b842..0eaa13a96f 100644
--- a/modules/globebrowsing/shaders/rings_geom_fs.glsl
+++ b/modules/globebrowsing/shaders/rings_geom_fs.glsl
@@ -32,43 +32,43 @@ uniform sampler1D ringTexture;
 uniform vec2 textureOffset;
 
 Fragment getFragment() {
-    // Moving the origin to the center
-    vec2 st = (vs_st - vec2(0.5)) * 2.0;
+  // Moving the origin to the center
+  vec2 st = (vs_st - vec2(0.5)) * 2.0;
 
-    // The length of the texture coordinates vector is our distance from the center
-    float radius = length(st);
+  // The length of the texture coordinates vector is our distance from the center
+  float radius = length(st);
 
-    // We only want to consider ring-like objects so we need to discard everything else
-    if (radius > 1.0) {
-        discard;
-    }
+  // We only want to consider ring-like objects so we need to discard everything else
+  if (radius > 1.0) {
+    discard;
+  }
 
-    // Remapping the texture coordinates
-    // Radius \in [0,1],  texCoord \in [textureOffset.x, textureOffset.y]
-    // textureOffset.x -> 0
-    // textureOffset.y -> 1
-    float texCoord = (radius - textureOffset.x) / (textureOffset.y - textureOffset.x);
-    if (texCoord < 0.f || texCoord > 1.f) {
-        discard;
-    }
+  // Remapping the texture coordinates
+  // Radius \in [0,1],  texCoord \in [textureOffset.x, textureOffset.y]
+  // textureOffset.x -> 0
+  // textureOffset.y -> 1
+  float texCoord = (radius - textureOffset.x) / (textureOffset.y - textureOffset.x);
+  if (texCoord < 0.0 || texCoord > 1.0) {
+    discard;
+  }
 
-    float diffuse = length(texture(ringTexture, texCoord).rgb);
-        
-    // The normal for the one plane depends on whether we are dealing
-    // with a front facing or back facing fragment
-    //vec3 normal;
-    // The plane is oriented on the xz plane
-    // WARNING: This might not be the case for Uranus
-    // if (gl_FrontFacing) {
-    //     normal = vec3(-1.0, 0.0, 0.0);
-    // }
-    // else {
-    //     normal = vec3(1.0, 0.0, 0.0);
-    // }
+  float diffuse = length(texture(ringTexture, texCoord).rgb);
+      
+  // The normal for the one plane depends on whether we are dealing
+  // with a front facing or back facing fragment
+  //vec3 normal;
+  // The plane is oriented on the xz plane
+  // WARNING: This might not be the case for Uranus
+  // if (gl_FrontFacing) {
+  //     normal = vec3(-1.0, 0.0, 0.0);
+  // }
+  // else {
+  //     normal = vec3(1.0, 0.0, 0.0);
+  // }
 
-    Fragment frag;
-    frag.color      = vec4(vec3(vs_screenSpaceDepth), 1.0);
-    frag.depth      = (diffuse < 0.5) ? 1E30 : vs_screenSpaceDepth;
-    
-    return frag;
+  Fragment frag;
+  frag.color = vec4(vec3(vs_screenSpaceDepth), 1.0);
+  frag.depth = (diffuse < 0.5) ? 1E30 : vs_screenSpaceDepth;
+  
+  return frag;
 }
diff --git a/modules/globebrowsing/shaders/rings_geom_vs.glsl b/modules/globebrowsing/shaders/rings_geom_vs.glsl
index 7698109c5b..2c18bd7fe2 100644
--- a/modules/globebrowsing/shaders/rings_geom_vs.glsl
+++ b/modules/globebrowsing/shaders/rings_geom_vs.glsl
@@ -35,13 +35,10 @@ out float vs_screenSpaceDepth;
 uniform dmat4 modelViewProjectionMatrix;
 
 void main() {
-    vs_st = in_st;
+  vs_st = in_st;
 
-    dvec4 positionClipSpace  = modelViewProjectionMatrix * 
-                               dvec4(in_position, 0.0, 1.0);
-    vec4 positionClipSpaceZNorm = z_normalization(vec4(positionClipSpace));
-    
-    vs_screenSpaceDepth  = positionClipSpaceZNorm.w;
-
-    gl_Position = positionClipSpaceZNorm;
+  dvec4 positionClipSpace  = modelViewProjectionMatrix * dvec4(in_position, 0.0, 1.0);
+  vec4 positionClipSpaceZNorm = z_normalization(vec4(positionClipSpace));
+  vs_screenSpaceDepth  = positionClipSpaceZNorm.w;
+  gl_Position = positionClipSpaceZNorm;
 }
diff --git a/modules/globebrowsing/shaders/rings_vs.glsl b/modules/globebrowsing/shaders/rings_vs.glsl
index 8b43a60571..5d58c668c9 100644
--- a/modules/globebrowsing/shaders/rings_vs.glsl
+++ b/modules/globebrowsing/shaders/rings_vs.glsl
@@ -31,7 +31,6 @@ layout(location = 1) in vec2 in_st;
 
 out vec2 vs_st;
 out float vs_screenSpaceDepth;
-out vec4 vs_positionViewSpace;
 out vec4 shadowCoords;
 
 uniform dmat4 modelViewProjectionMatrix;
@@ -42,12 +41,12 @@ uniform dmat4 modelViewProjectionMatrix;
 uniform dmat4 shadowMatrix;
 
 void main() {
-    vs_st = in_st;
+  vs_st = in_st;
 
-    dvec4 positionClipSpace  = modelViewProjectionMatrix * dvec4(in_position, 0.0, 1.0);
-    vec4 positionClipSpaceZNorm = z_normalization(vec4(positionClipSpace));
-    
-    shadowCoords = vec4(shadowMatrix * dvec4(in_position, 0.0, 1.0));
-    vs_screenSpaceDepth  = positionClipSpaceZNorm.w;
-    gl_Position = positionClipSpaceZNorm;
+  dvec4 positionClipSpace  = modelViewProjectionMatrix * dvec4(in_position, 0.0, 1.0);
+  vec4 positionClipSpaceZNorm = z_normalization(vec4(positionClipSpace));
+  
+  shadowCoords = vec4(shadowMatrix * dvec4(in_position, 0.0, 1.0));
+  vs_screenSpaceDepth  = positionClipSpaceZNorm.w;
+  gl_Position = positionClipSpaceZNorm;
 }
diff --git a/modules/globebrowsing/shaders/smviewer_fs.glsl b/modules/globebrowsing/shaders/smviewer_fs.glsl
deleted file mode 100644
index 56d518a85e..0000000000
--- a/modules/globebrowsing/shaders/smviewer_fs.glsl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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 "PowerScaling/powerScaling_fs.hglsl"
-#include "fragment.glsl"
-
-precision highp float;
-
-in vec2 texCoord;
-
-uniform highp sampler2D shadowMapTexture;
-
-Fragment getFragment() {
-    Fragment frag;
-    frag.color = vec4(vec3(1.f) - texture(shadowMapTexture, texCoord).rrr, 1.f);
-    frag.depth = 0.f;
-    
-    return frag;
-}
diff --git a/modules/globebrowsing/shaders/smviewer_vs.glsl b/modules/globebrowsing/shaders/smviewer_vs.glsl
deleted file mode 100644
index 208ce361c4..0000000000
--- a/modules/globebrowsing/shaders/smviewer_vs.glsl
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#version __CONTEXT__
-
-out vec2 texCoord;
-
-const vec3 posData[6] = vec3[] (
-    vec3(1.0, -0.5, 0.0),
-    vec3(0.5, -0.5, 0.0),
-    vec3(0.5, -1.0, 0.0),
-    vec3(1.0, -1.0, 0.0),
-    vec3(1.0, -0.5, 0.0),
-    vec3(0.5, -1.0, 0.0)
-);
-
-const vec2 texData[6] = vec2[] (
-    vec2(1.0, 1.0),
-    vec2(0.0, 1.0),
-    vec2(0.0, 0.0),
-    vec2(1.0, 0.0),
-    vec2(1.0, 1.0),
-    vec2(0.0, 0.0)
-
-);
-
-void main() {
-    texCoord = texData[gl_VertexID];
-    gl_Position = vec4(posData[gl_VertexID], 1.0);
-}
diff --git a/modules/globebrowsing/shaders/texturetilemapping.glsl b/modules/globebrowsing/shaders/texturetilemapping.glsl
new file mode 100644
index 0000000000..5b39d02c42
--- /dev/null
+++ b/modules/globebrowsing/shaders/texturetilemapping.glsl
@@ -0,0 +1,457 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2021                                                               *
+ *                                                                                       *
+ * Permission is hereby 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 TEXTURETILEMAPPING_HGLSL
+#define TEXTURETILEMAPPING_HGLSL
+
+#include <${MODULE_GLOBEBROWSING}/shaders/tile.glsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/blending.glsl>
+
+// First layer type from LayerShaderManager is height map
+#define NUMLAYERS_HEIGHTMAP #{lastLayerIndexHeightLayers} + 1
+#define USE_HEIGHTMAP #{useHeightLayers}
+#define HEIGHTMAP_BLENDING_ENABLED #{blendHeightLayers}
+
+// Second layer type from LayerShaderManager is color texture
+#define NUMLAYERS_COLORTEXTURE #{lastLayerIndexColorLayers} + 1
+#define USE_COLORTEXTURE #{useColorLayers}
+#define COLORTEXTURE_BLENDING_ENABLED #{blendColorLayers}
+
+ // Third layer type from LayerShaderManager is water mask
+#define NUMLAYERS_WATERMASK #{lastLayerIndexWaterMasks} + 1
+#define USE_WATERMASK #{useWaterMasks}
+#define WATERMASK_BLENDING_ENABLED #{blendWaterMasks}
+
+// Fourth layer type from LayerShaderManager is night texture
+#define NUMLAYERS_NIGHTTEXTURE #{lastLayerIndexNightLayers} + 1
+#define USE_NIGHTTEXTURE #{useNightLayers}
+#define NIGHTTEXTURE_BLENDING_ENABLED #{blendNightLayers}
+
+// Fifth layer type from LayerShaderManager is overlay
+#define NUMLAYERS_OVERLAY #{lastLayerIndexOverlays} + 1
+#define USE_OVERLAY #{useOverlays}
+#define OVERLAY_BLENDING_ENABLED #{blendOverlays}
+
+// Global constants
+#define CHUNK_DEFAULT_HEIGHT #{defaultHeight}
+
+// Other key value pairs used for settings
+#define USE_ACCURATE_NORMALS #{useAccurateNormals}
+#define PERFORM_SHADING #{performShading}
+#define USE_ECLIPSE_SHADOWS #{useEclipseShadows}
+#define USE_ECLIPSE_HARD_SHADOWS #{useEclipseHardShadows}
+#define SHOW_CHUNK_EDGES #{showChunkEdges}
+#define SHOW_HEIGHT_RESOLUTION #{showHeightResolution}
+#define SHOW_HEIGHT_INTENSITIES #{showHeightIntensities}
+#define SHADOW_MAPPING_ENABLED #{enableShadowMapping}
+
+const vec3 DefaultLevelWeights = vec3(1.0, 0.0, 0.0);
+
+float orenNayarDiffuse(vec3 lightDirection, vec3 viewDirection, vec3 surfaceNormal,
+                       float roughness)
+{
+  // calculate intermediary values
+  float NdotL = dot(surfaceNormal, lightDirection);
+  float NdotV = dot(surfaceNormal, viewDirection); 
+
+  float angleVN = acos(NdotV);
+  float angleLN = acos(NdotL);
+  
+  float alpha = max(angleVN, angleLN);
+  float beta = min(angleVN, angleLN);
+  float gamma = dot(
+    viewDirection - surfaceNormal * dot(viewDirection, surfaceNormal),
+    lightDirection - surfaceNormal * dot(lightDirection, surfaceNormal)
+  );
+  
+  float roughnessSquared = roughness * roughness;
+  
+  // calculate A and B
+  float A = 1.0 - 0.5 * (roughnessSquared / (roughnessSquared + 0.57));
+  float B = 0.45 * (roughnessSquared / (roughnessSquared + 0.09));
+  float C = sin(alpha) * tan(beta);
+  
+  // put it all together
+  return max(0.0, NdotL) * (A + B * max(0.0, gamma) * C);
+}
+
+float performLayerSettings(float value, LayerSettings settings) {
+  float v = pow(abs(value), settings.gamma) * settings.multiplier + settings.offset;
+  return sign(value) * v * settings.opacity;
+}
+
+vec4 performLayerSettings(vec4 currentValue, LayerSettings settings) {
+  vec3 newValue = sign(currentValue.rgb) * pow(abs(currentValue.rgb), vec3(settings.gamma)) *
+          settings.multiplier + settings.offset;
+  return vec4(newValue, currentValue.a * settings.opacity);
+}
+
+vec2 tileUVToTextureSamplePosition(ChunkTile chunkTile, vec2 tileUV, PixelPadding padding)
+{
+  vec2 uv = chunkTile.uvTransform.uvOffset + chunkTile.uvTransform.uvScale * tileUV;
+
+  // compensateSourceTextureSampling
+  ivec2 resolution = textureSize(chunkTile.textureSampler, 0);
+  vec2 sourceSize = vec2(resolution) + padding.sizeDifference;
+  vec2 currentSize = vec2(resolution);
+  vec2 sourceToCurrentSize = currentSize / sourceSize;
+  return sourceToCurrentSize * (uv - padding.startOffset / sourceSize);
+}
+
+vec4 getTexVal(ChunkTilePile chunkTilePile, vec3 w, vec2 uv, PixelPadding padding) {
+  vec4 v1 = texture(
+    chunkTilePile.chunkTile0.textureSampler,
+    tileUVToTextureSamplePosition(chunkTilePile.chunkTile0, uv, padding)
+  );
+  vec4 v2 = texture(
+    chunkTilePile.chunkTile1.textureSampler,
+    tileUVToTextureSamplePosition(chunkTilePile.chunkTile1, uv, padding)
+  );
+  vec4 v3 = texture(
+    chunkTilePile.chunkTile2.textureSampler,
+    tileUVToTextureSamplePosition(chunkTilePile.chunkTile2, uv, padding)
+  );
+
+  return w.x * v1 + w.y * v2 + w.z * v3;
+}
+
+#for id, layerGroup in layerGroups
+#for i in 0..#{lastLayerIndex#{layerGroup}}
+
+vec4 getSample#{layerGroup}#{i}(vec2 uv, vec3 levelWeights,
+                                Layer #{layerGroup}[#{lastLayerIndex#{layerGroup}} + 1])
+{
+  vec4 c = vec4(0.0, 0.0, 0.0, 1.0);
+
+    // All tile layers are the same. Sample from texture
+#if (#{#{layerGroup}#{i}LayerType} == 0) // DefaultTileLayer
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+#elif (#{#{layerGroup}#{i}LayerType} == 1) // SingleImageTileLayer
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+#elif (#{#{layerGroup}#{i}LayerType} == 2) // SizeReferenceTileLayer
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+#elif (#{#{layerGroup}#{i}LayerType} == 3) // TemporalTileLayer
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+#elif (#{#{layerGroup}#{i}LayerType} == 4) // TileIndexTileLayer
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+#elif (#{#{layerGroup}#{i}LayerType} == 5) // ByIndexTileLayer
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+#elif (#{#{layerGroup}#{i}LayerType} == 6) // ByLevelTileLayer
+  c = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
+#elif (#{#{layerGroup}#{i}LayerType} == 7) // SolidColor
+  c.rgb = #{layerGroup}[#{i}].color;
+#endif
+
+  return c;
+}
+
+#endfor
+#endfor
+
+#define BlendModeDefault 0
+#define BlendModeMultiply 1
+#define BlendModeAdd 2
+#define BlendModeSubtract 3
+#define BlendModeColor 4
+
+#for id, layerGroup in layerGroups
+#for i in 0..#{lastLayerIndex#{layerGroup}}
+
+vec4 blend#{layerGroup}#{i}(vec4 currentColor, vec4 newColor, float blendFactor) {
+#if (#{#{layerGroup}#{i}BlendMode} == BlendModeDefault)
+  return blendNormal(currentColor, vec4(newColor.rgb, newColor.a * blendFactor)); 
+#elif (#{#{layerGroup}#{i}BlendMode} == BlendModeMultiply)
+  return blendMultiply(currentColor, newColor * blendFactor);
+#elif (#{#{layerGroup}#{i}BlendMode} == BlendModeAdd)
+  return blendAdd(currentColor, newColor * blendFactor);
+#elif (#{#{layerGroup}#{i}BlendMode} == BlendModeSubtract)
+  return blendSubtract(currentColor, newColor * blendFactor);
+#elif (#{#{layerGroup}#{i}BlendMode} == BlendModeColor)
+    // Convert color to grayscale
+  float gray = (newColor.r + newColor.g + newColor.b) / 3.0;
+  
+  vec3 hsvCurrent = rgb2hsv(currentColor.rgb);
+  // Use gray from new color as value in hsv
+  vec3 hsvNew = vec3(hsvCurrent.x, hsvCurrent.y, gray);
+  vec3 rgbNew = hsv2rgb(hsvNew);
+
+  vec4 color = blendNormal(currentColor, vec4(rgbNew, newColor.a * blendFactor));
+  return color;
+#endif
+}
+
+#endfor
+#endfor
+
+#define LayerAdjustmentTypeDefault 0
+#define LayerAdjustmentTypeChroma 1
+#define LayerAdjustmentTypeTransferFunction 1
+
+#for id, layerGroup in layerGroups
+#for i in 0..#{lastLayerIndex#{layerGroup}}
+
+vec4 performAdjustment#{layerGroup}#{i}(vec4 currentColor, LayerAdjustment adjustment) {
+#if (#{#{layerGroup}#{i}LayerAdjustmentType} == LayerAdjustmentTypeDefault)
+  return currentColor;
+#elif (#{#{layerGroup}#{i}LayerAdjustmentType} == LayerAdjustmentTypeChroma)
+  if (distance(currentColor.rgb, adjustment.chromaKeyColor) <=
+      adjustment.chromaKeyTolerance)
+  {
+    return vec4(0.0);
+  }
+  else {
+    return currentColor;
+  }
+#elif (#{#{layerGroup}#{i}LayerAdjustmentType} == LayerAdjustmentTypeTransferFunction)
+  return currentColor;
+#else
+  return currentColor;
+#endif
+}
+
+#endfor
+#endfor
+
+float calculateUntransformedHeight(vec2 uv, vec3 levelWeights,
+                                   Layer HeightLayers[NUMLAYERS_HEIGHTMAP])
+{
+
+  float height = 0;
+
+  // The shader compiler will remove unused code when variables are multiplied by
+  // a constant 0
+#if !HEIGHTMAP_BLENDING_ENABLED
+  levelWeights = DefaultLevelWeights;
+#endif // HEIGHTMAP_BLENDING_ENABLED
+    
+  #for i in 0..#{lastLayerIndexHeightLayers}
+  {
+    vec4 colorSample = getSampleHeightLayers#{i}(uv, levelWeights, HeightLayers);
+    colorSample = performAdjustmentHeightLayers#{i}(colorSample, HeightLayers[#{i}].adjustment);
+    height = colorSample.r;
+
+    height = performLayerSettings(height, HeightLayers[#{i}].settings);
+  }
+  #endfor
+  return height;
+}
+
+float calculateHeight(vec2 uv, vec3 levelWeights, Layer HeightLayers[NUMLAYERS_HEIGHTMAP])
+{
+  float height = 0;
+
+  // The shader compiler will remove unused code when variables are multiplied by
+  // a constant 0
+#if !HEIGHTMAP_BLENDING_ENABLED
+  levelWeights = DefaultLevelWeights;
+#endif // HEIGHTMAP_BLENDING_ENABLED
+
+  #for i in 0..#{lastLayerIndexHeightLayers}
+  {
+    vec4 colorSample = getSampleHeightLayers#{i}(uv, levelWeights, HeightLayers);
+    colorSample = performAdjustmentHeightLayers#{i}(colorSample, HeightLayers[#{i}].adjustment);
+    float untransformedHeight = colorSample.r;
+
+    TileDepthTransform transform = HeightLayers[#{i}].depthTransform;
+    float heightSample = transform.depthScale * untransformedHeight + transform.depthOffset;
+    if (heightSample > -100000) {
+      heightSample = performLayerSettings(heightSample, HeightLayers[#{i}].settings);
+      height = heightSample;
+    }
+  }
+  #endfor
+  return height;
+}
+
+vec4 calculateColor(vec4 currentColor, vec2 uv, vec3 levelWeights,
+                    Layer ColorLayers[NUMLAYERS_COLORTEXTURE])
+{
+  vec4 color = currentColor;
+
+  // The shader compiler will remove unused code when variables are multiplied by
+  // a constant 0
+#if !COLORTEXTURE_BLENDING_ENABLED
+  levelWeights = DefaultLevelWeights;
+#endif // COLORTEXTURE_BLENDING_ENABLED
+
+  #for i in 0..#{lastLayerIndexColorLayers}
+  {
+    vec4 colorSample = getSampleColorLayers#{i}(uv, levelWeights, ColorLayers);
+    colorSample = performAdjustmentColorLayers#{i}(colorSample, ColorLayers[#{i}].adjustment);
+    colorSample = performLayerSettings(colorSample, ColorLayers[#{i}].settings);
+
+    color = blendColorLayers#{i}(color, colorSample, 1.0);
+  }
+  #endfor
+
+  return color;
+}
+
+float gridDots(vec2 uv, vec2 gridResolution) {
+  vec2 uvVertexSpace = fract((gridResolution) * uv) + 0.5;
+
+  vec2 uvDotSpace = abs(2.0 * (uvVertexSpace - 0.5));
+  return 1.0 - length(1.0 - uvDotSpace);
+}
+
+vec4 calculateDebugColor(vec2 uv, vec4 fragPos, vec2 vertexResolution) {
+  vec2 uvVertexSpace = fract(vertexResolution * uv);
+  vec3 colorUv = vec3(0.3 * uv.x, 0.3 * uv.y, 0);
+  vec3 colorDistance = vec3(0.0, 0.0, min(0.4 * log(fragPos.w) - 3.9, 1));
+  vec3 colorVertex = (1.0 - length(uvVertexSpace)) * vec3(0.5);
+  vec3 colorSum = colorUv + colorDistance + colorVertex;
+  return vec4(0.5 * colorSum, 1);
+}
+
+float tileResolution(vec2 tileUV, ChunkTile chunkTile) {
+  PixelPadding padding;
+  padding.startOffset = ivec2(0);
+  padding.sizeDifference = ivec2(0);
+
+  vec2 heightResolution = textureSize(chunkTile.textureSampler, 0);
+  vec2 uv = tileUVToTextureSamplePosition(chunkTile, tileUV, padding);
+  return gridDots(uv, heightResolution);
+}
+
+vec4 calculateNight(vec4 currentColor, vec2 uv, vec3 levelWeights,
+                    Layer NightLayers[NUMLAYERS_NIGHTTEXTURE],
+                    vec3 ellipsoidNormalCameraSpace, vec3 lightDirectionCameraSpace)
+{
+  vec4 nightColor = vec4(0.0);
+  vec4 color = currentColor;
+
+  // The shader compiler will remove unused code when variables are multiplied by
+  // a constant 0
+#if !NIGHTTEXTURE_BLENDING_ENABLED
+  levelWeights = DefaultLevelWeights;
+#endif // NIGHTTEXTURE_BLENDING_ENABLED
+
+  vec3 n = normalize(ellipsoidNormalCameraSpace);
+  vec3 l = lightDirectionCameraSpace;
+  float cosineFactor = clamp(dot(l, normalize(n + 0.20 * l)) * 3 , 0, 1);
+  
+  #for i in 0..#{lastLayerIndexNightLayers}
+  {
+    vec4 colorSample = getSampleNightLayers#{i}(uv, levelWeights, NightLayers);
+    colorSample = performAdjustmentNightLayers#{i}(colorSample, NightLayers[#{i}].adjustment);
+    colorSample = performLayerSettings(colorSample, NightLayers[#{i}].settings);
+
+    float adjustedAlpha = cosineFactor * colorSample.a;
+    // Filter to night side
+    vec4 newColor = vec4(cosineFactor * colorSample.xyz, adjustedAlpha);
+
+    color = blendNightLayers#{i}(color, newColor, adjustedAlpha);
+  }
+  #endfor
+
+  return color;
+}
+
+vec4 calculateShadedColor(vec4 currentColor, vec3 ellipsoidNormalCameraSpace,
+                          vec3 lightDirectionCameraSpace, vec3 viewDirectionCameraSpace,
+                          float roughness)
+{
+  vec3 shadedColor = currentColor.rgb * 0.05;
+
+  vec3 n = normalize(ellipsoidNormalCameraSpace);
+
+  float power = orenNayarDiffuse(
+    -lightDirectionCameraSpace,
+    viewDirectionCameraSpace,
+    ellipsoidNormalCameraSpace,
+    roughness
+  );
+
+  vec3 l = lightDirectionCameraSpace;
+  power = max(smoothstep(0.0, 0.1, max(dot(-l, n), 0.0)) * power, 0.0);
+
+  vec4 color = vec4(shadedColor + currentColor.rgb * power, currentColor.a);
+  return color;
+}
+
+vec4 calculateOverlay(vec4 currentColor, vec2 uv, vec3 levelWeights,
+                      Layer Overlays[NUMLAYERS_OVERLAY])
+{
+  vec4 color = currentColor;
+
+  // The shader compiler will remove unused code when variables are multiplied by
+  // a constant 0
+#if !OVERLAY_BLENDING_ENABLED
+  levelWeights = DefaultLevelWeights;
+#endif // OVERLAY_BLENDING_ENABLED
+
+  #for i in 0..#{lastLayerIndexOverlays}
+  {
+    vec4 colorSample = getSampleOverlays#{i}(uv, levelWeights, Overlays);
+    colorSample = performAdjustmentOverlays#{i}(colorSample, Overlays[#{i}].adjustment);
+
+    colorSample = performLayerSettings(colorSample, Overlays[#{i}].settings);
+
+    color = blendNormal(color, colorSample);
+    color = blendOverlays#{i}(color, colorSample, 1.0);
+  }
+  #endfor
+
+  return color;
+}
+
+vec4 calculateWater(vec4 currentColor, vec2 uv, vec3 levelWeights, 
+                    Layer WaterMasks[NUMLAYERS_WATERMASK],
+                    vec3 ellipsoidNormalCameraSpace, vec3 lightDirectionCameraSpace,
+                    vec3 positionCameraSpace, out float reflectance)
+{
+  vec4 waterColor = vec4(0.0);
+
+  // The shader compiler will remove unused code when variables are multiplied by
+  // a constant 0
+#if !WATERMASK_BLENDING_ENABLED
+  levelWeights = DefaultLevelWeights;
+#endif // WATERMASK_BLENDING_ENABLED
+
+  #for i in 0..#{lastLayerIndexWaterMasks}
+  {
+    vec4 colorSample = getSampleWaterMasks#{i}(uv, levelWeights, WaterMasks);
+    colorSample = performAdjustmentWaterMasks#{i}(colorSample, WaterMasks[#{i}].adjustment);
+
+    colorSample.a = performLayerSettings(colorSample.a, WaterMasks[#{i}].settings);
+
+    waterColor = blendWaterMasks#{i}(waterColor, colorSample, 1.0);
+  }
+  #endfor
+
+  vec3 directionToFragmentCameraSpace = normalize(positionCameraSpace - vec3(0, 0, 0));
+  vec3 reflectionDirectionCameraSpace = reflect(lightDirectionCameraSpace, ellipsoidNormalCameraSpace);
+  // float cosineFactor = clamp(dot(-reflectionDirectionCameraSpace, directionToFragmentCameraSpace), 0, 1);
+  // cosineFactor = pow(cosineFactor, 100);
+
+  // const float specularIntensity = 0.4;
+  // vec3 specularTotal = cosineFactor * specularIntensity * waterColor.a;
+
+  reflectance = waterColor.a;
+  //return blendNormal(currentColor, waterColor);
+  //return currentColor + vec4(specularTotal, 1);
+  return currentColor;
+}
+
+#endif // TEXTURETILEMAPPING_HGLSL
diff --git a/modules/globebrowsing/shaders/texturetilemapping.hglsl b/modules/globebrowsing/shaders/texturetilemapping.hglsl
deleted file mode 100644
index 5cf2214291..0000000000
--- a/modules/globebrowsing/shaders/texturetilemapping.hglsl
+++ /dev/null
@@ -1,461 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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 TEXTURETILEMAPPING_HGLSL
-#define TEXTURETILEMAPPING_HGLSL
-
-#include <${MODULE_GLOBEBROWSING}/shaders/tile.hglsl>
-#include <${MODULE_GLOBEBROWSING}/shaders/blending.hglsl>
-
-// First layer type from LayerShaderManager is height map
-#define NUMLAYERS_HEIGHTMAP #{lastLayerIndexHeightLayers} + 1
-#define USE_HEIGHTMAP #{useHeightLayers}
-#define HEIGHTMAP_BLENDING_ENABLED #{blendHeightLayers}
-
-// Second layer type from LayerShaderManager is color texture
-#define NUMLAYERS_COLORTEXTURE #{lastLayerIndexColorLayers} + 1
-#define USE_COLORTEXTURE #{useColorLayers}
-#define COLORTEXTURE_BLENDING_ENABLED #{blendColorLayers}
-
- // Third layer type from LayerShaderManager is water mask
-#define NUMLAYERS_WATERMASK #{lastLayerIndexWaterMasks} + 1
-#define USE_WATERMASK #{useWaterMasks}
-#define WATERMASK_BLENDING_ENABLED #{blendWaterMasks}
-
-// Fourth layer type from LayerShaderManager is night texture
-#define NUMLAYERS_NIGHTTEXTURE #{lastLayerIndexNightLayers} + 1
-#define USE_NIGHTTEXTURE #{useNightLayers}
-#define NIGHTTEXTURE_BLENDING_ENABLED #{blendNightLayers}
-
-// Fifth layer type from LayerShaderManager is overlay
-#define NUMLAYERS_OVERLAY #{lastLayerIndexOverlays} + 1
-#define USE_OVERLAY #{useOverlays}
-#define OVERLAY_BLENDING_ENABLED #{blendOverlays}
-
-// Global constants
-#define CHUNK_DEFAULT_HEIGHT #{defaultHeight}
-
-// Other key value pairs used for settings
-#define USE_ACCURATE_NORMALS #{useAccurateNormals}
-#define PERFORM_SHADING #{performShading}
-#define USE_ECLIPSE_SHADOWS #{useEclipseShadows}
-#define USE_ECLIPSE_HARD_SHADOWS #{useEclipseHardShadows}
-#define SHOW_CHUNK_EDGES #{showChunkEdges}
-#define SHOW_HEIGHT_RESOLUTION #{showHeightResolution}
-#define SHOW_HEIGHT_INTENSITIES #{showHeightIntensities}
-#define SHADOW_MAPPING_ENABLED #{enableShadowMapping}
-
-const vec3 DefaultLevelWeights = vec3(1.0, 0.0, 0.0);
-
-float orenNayarDiffuse(vec3 lightDirection, vec3 viewDirection, vec3 surfaceNormal,
-                       float roughness)
-{
-    // calculate intermediary values
-    float NdotL = dot(surfaceNormal, lightDirection);
-    float NdotV = dot(surfaceNormal, viewDirection); 
-
-    float angleVN = acos(NdotV);
-    float angleLN = acos(NdotL);
-    
-    float alpha = max(angleVN, angleLN);
-    float beta = min(angleVN, angleLN);
-    float gamma = dot(
-        viewDirection - surfaceNormal * dot(viewDirection, surfaceNormal),
-        lightDirection - surfaceNormal * dot(lightDirection, surfaceNormal)
-    );
-    
-    float roughnessSquared = roughness * roughness;
-    
-    // calculate A and B
-    float A = 1.0 - 0.5 * (roughnessSquared / (roughnessSquared + 0.57));
-    float B = 0.45 * (roughnessSquared / (roughnessSquared + 0.09));
-    float C = sin(alpha) * tan(beta);
-    
-    // put it all together
-    return max(0.0, NdotL) * (A + B * max(0.0, gamma) * C);
-}
-
-float performLayerSettings(float currentValue, LayerSettings settings) {
-    float v = sign(currentValue) * pow(abs(currentValue), settings.gamma) *
-              settings.multiplier + settings.offset;
-    return v * settings.opacity;
-}
-
-vec4 performLayerSettings(vec4 currentValue, LayerSettings settings) {
-    vec3 newValue = sign(currentValue.rgb) * pow(abs(currentValue.rgb), vec3(settings.gamma)) *
-           settings.multiplier + settings.offset;
-    return vec4(newValue, currentValue.a * settings.opacity);
-}
-
-vec2 tileUVToTextureSamplePosition(ChunkTile chunkTile, vec2 tileUV,
-                                   PixelPadding padding)
-{
-    vec2 uv = chunkTile.uvTransform.uvOffset + chunkTile.uvTransform.uvScale * tileUV;
-
-    // compensateSourceTextureSampling
-    ivec2 resolution = textureSize(chunkTile.textureSampler, 0);
-    vec2 sourceSize = vec2(resolution) + padding.sizeDifference;
-    vec2 currentSize = vec2(resolution);
-    vec2 sourceToCurrentSize = currentSize / sourceSize;
-    return sourceToCurrentSize * (uv - padding.startOffset / sourceSize);
-}
-
-vec4 getTexVal(ChunkTilePile chunkTilePile, vec3 w, vec2 uv,
-               PixelPadding padding)
-{
-    vec4 v1 = texture(
-        chunkTilePile.chunkTile0.textureSampler,
-        tileUVToTextureSamplePosition(chunkTilePile.chunkTile0, uv, padding)
-    );
-    vec4 v2 = texture(
-        chunkTilePile.chunkTile1.textureSampler,
-        tileUVToTextureSamplePosition(chunkTilePile.chunkTile1, uv, padding)
-    );
-    vec4 v3 = texture(
-        chunkTilePile.chunkTile2.textureSampler,
-        tileUVToTextureSamplePosition(chunkTilePile.chunkTile2, uv, padding)
-    );
-
-    return w.x * v1 + w.y * v2 + w.z * v3;
-}
-
-#for id, layerGroup in layerGroups
-#for i in 0..#{lastLayerIndex#{layerGroup}}
-
-vec4 getSample#{layerGroup}#{i}(vec2 uv, vec3 levelWeights,
-                            Layer #{layerGroup}[#{lastLayerIndex#{layerGroup}} + 1])
-{
-    vec4 color = vec4(0.0, 0.0, 0.0, 1.0);
-
-    // All tile layers are the same. Sample from texture
-#if (#{#{layerGroup}#{i}LayerType} == 0) // DefaultTileLayer
-    color = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 1) // SingleImageTileLayer
-    color = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 2) // SizeReferenceTileLayer
-    color = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 3) // TemporalTileLayer
-    color = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 4) // TileIndexTileLayer
-    color = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 5) // ByIndexTileLayer
-    color = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 6) // ByLevelTileLayer
-    color = getTexVal(#{layerGroup}[#{i}].pile, levelWeights, uv, #{layerGroup}[#{i}].padding);
-#elif (#{#{layerGroup}#{i}LayerType} == 7) // SolidColor
-    color.rgb = #{layerGroup}[#{i}].color;
-#endif
-
-    return color;
-}
-
-#endfor
-#endfor
-
-#for id, layerGroup in layerGroups
-#for i in 0..#{lastLayerIndex#{layerGroup}}
-
-vec4 blend#{layerGroup}#{i}(vec4 currentColor, vec4 newColor, float blendFactor) {
-#if (#{#{layerGroup}#{i}BlendMode} == 0) // Default, Normal
-    return blendNormal(currentColor, vec4(newColor.rgb, newColor.a * blendFactor)); 
-#elif (#{#{layerGroup}#{i}BlendMode} == 1) // Multiply
-    return blendMultiply(currentColor, newColor * blendFactor);
-#elif (#{#{layerGroup}#{i}BlendMode} == 2) // Add
-    return blendAdd(currentColor, newColor * blendFactor);
-#elif (#{#{layerGroup}#{i}BlendMode} == 3) // Subtract
-    return blendSubtract(currentColor, newColor * blendFactor);
-#elif (#{#{layerGroup}#{i}BlendMode} == 4) // Color
-    // Convert color to grayscale
-    float gray = (newColor.r + newColor.g + newColor.b) / 3.0;
-    
-    vec3 hsvCurrent = rgb2hsv(currentColor.rgb);
-    // Use gray from new color as value in hsv
-    vec3 hsvNew = vec3(hsvCurrent.x, hsvCurrent.y, gray);
-    vec3 rgbNew = hsv2rgb(hsvNew);
-
-    vec4 color = blendNormal(currentColor, vec4(rgbNew, newColor.a * blendFactor));
-    return color;
-#endif
-}
-
-#endfor
-#endfor
-
-
-#for id, layerGroup in layerGroups
-#for i in 0..#{lastLayerIndex#{layerGroup}}
-
-vec4 performAdjustment#{layerGroup}#{i}(vec4 currentColor,
-                                        LayerAdjustment adjustment)
-{
-#if (#{#{layerGroup}#{i}LayerAdjustmentType} == 0) // Default, None
-    return currentColor;
-#elif (#{#{layerGroup}#{i}LayerAdjustmentType} == 1) // ChromaKey
-    if (distance(
-        currentColor.rgb,
-        adjustment.chromaKeyColor
-        ) <= adjustment.chromaKeyTolerance)
-    {
-        return vec4(0.0);
-    }
-    else {
-        return currentColor;
-    }
-#elif (#{#{layerGroup}#{i}LayerAdjustmentType} == 2) // TransferFunction
-    return currentColor;
-#else
-    return currentColor;
-#endif
-}
-
-#endfor
-#endfor
-
-float calculateUntransformedHeight(vec2 uv, vec3 levelWeights,
-                                   Layer HeightLayers[NUMLAYERS_HEIGHTMAP])
-{
-
-    float height = 0;
-
-    // The shader compiler will remove unused code when variables are multiplied by
-    // a constant 0
-#if !HEIGHTMAP_BLENDING_ENABLED
-    levelWeights = DefaultLevelWeights;
-#endif // HEIGHTMAP_BLENDING_ENABLED
-    
-    #for i in 0..#{lastLayerIndexHeightLayers}
-    {
-        vec4 colorSample = getSampleHeightLayers#{i}(uv, levelWeights, HeightLayers);
-        colorSample = performAdjustmentHeightLayers#{i}(colorSample, HeightLayers[#{i}].adjustment);
-        height = colorSample.r;
-
-        height = performLayerSettings(height, HeightLayers[#{i}].settings);
-    }
-    #endfor
-    return height;
-}
-
-float calculateHeight(vec2 uv, vec3 levelWeights, Layer HeightLayers[NUMLAYERS_HEIGHTMAP])
-{
-    float height = 0;
-
-    // The shader compiler will remove unused code when variables are multiplied by
-    // a constant 0
-#if !HEIGHTMAP_BLENDING_ENABLED
-    levelWeights = DefaultLevelWeights;
-#endif // HEIGHTMAP_BLENDING_ENABLED
-
-    
-    #for i in 0..#{lastLayerIndexHeightLayers}
-    {
-        vec4 colorSample = getSampleHeightLayers#{i}(uv, levelWeights, HeightLayers);
-        colorSample = performAdjustmentHeightLayers#{i}(colorSample, HeightLayers[#{i}].adjustment);
-        float untransformedHeight = colorSample.r;
-
-        TileDepthTransform transform = HeightLayers[#{i}].depthTransform;
-        float heightSample =
-            transform.depthScale * untransformedHeight + transform.depthOffset;
-        if (heightSample > -100000) {
-            heightSample = performLayerSettings(heightSample, HeightLayers[#{i}].settings);
-            height = heightSample;
-        }
-    }
-    #endfor
-    return height;
-}
-
-vec4 calculateColor(vec4 currentColor, vec2 uv, vec3 levelWeights,
-                    Layer ColorLayers[NUMLAYERS_COLORTEXTURE])
-{
-    vec4 color = currentColor;
-
-    // The shader compiler will remove unused code when variables are multiplied by
-    // a constant 0
-#if !COLORTEXTURE_BLENDING_ENABLED
-    levelWeights = DefaultLevelWeights;
-#endif // COLORTEXTURE_BLENDING_ENABLED
-
-    #for i in 0..#{lastLayerIndexColorLayers}
-    {
-        vec4 colorSample = getSampleColorLayers#{i}(uv, levelWeights, ColorLayers);
-        colorSample = performAdjustmentColorLayers#{i}(colorSample, ColorLayers[#{i}].adjustment);
-        colorSample = performLayerSettings(colorSample, ColorLayers[#{i}].settings);
-
-        color = blendColorLayers#{i}(color, colorSample, 1.0);
-    }
-    #endfor
-
-    return color;
-}
-
-float gridDots(vec2 uv, vec2 gridResolution) {
-    vec2 uvVertexSpace = fract((gridResolution) * uv) + 0.5;
-
-    vec2 uvDotSpace = abs(2.0 * (uvVertexSpace - 0.5));
-    return 1.0 - length(1.0 - uvDotSpace);
-}
-
-vec4 calculateDebugColor(vec2 uv, vec4 fragPos, vec2 vertexResolution) {
-    vec2 uvVertexSpace = fract(vertexResolution * uv);
-    vec3 colorUv = vec3(0.3 * uv.x, 0.3 * uv.y, 0);
-    vec3 colorDistance = vec3(0.0, 0.0, min(0.4 * log(fragPos.w) - 3.9, 1));
-    vec3 colorVertex = (1.0 - length(uvVertexSpace)) * vec3(0.5);
-    vec3 colorSum = colorUv + colorDistance + colorVertex;
-    return vec4(0.5 * colorSum, 1);
-}
-
-float tileResolution(vec2 tileUV, ChunkTile chunkTile) {
-    PixelPadding padding;
-    padding.startOffset = ivec2(0);
-    padding.sizeDifference = ivec2(0);
-
-    vec2 heightResolution = textureSize(chunkTile.textureSampler, 0);
-    vec2 uv = tileUVToTextureSamplePosition(chunkTile, tileUV, padding);
-    return gridDots(uv, heightResolution);
-}
-
-vec4 calculateNight(vec4 currentColor, vec2 uv, vec3 levelWeights,
-                    Layer NightLayers[NUMLAYERS_NIGHTTEXTURE],
-                    vec3 ellipsoidNormalCameraSpace,
-                    vec3 lightDirectionCameraSpace)
-{
-    vec4 nightColor = vec4(0.0);
-    vec4 color = currentColor;
-
-    // The shader compiler will remove unused code when variables are multiplied by
-    // a constant 0
-#if !NIGHTTEXTURE_BLENDING_ENABLED
-    levelWeights = DefaultLevelWeights;
-#endif // NIGHTTEXTURE_BLENDING_ENABLED
-
-    vec3 n = normalize(ellipsoidNormalCameraSpace);
-    vec3 l = lightDirectionCameraSpace;
-    float cosineFactor = clamp(dot(l, normalize(n + 0.20 * l)) * 3 , 0, 1);
-    
-    #for i in 0..#{lastLayerIndexNightLayers}
-    {
-        vec4 colorSample = getSampleNightLayers#{i}(uv, levelWeights, NightLayers);
-        colorSample = performAdjustmentNightLayers#{i}(colorSample, NightLayers[#{i}].adjustment);
-        colorSample = performLayerSettings(colorSample, NightLayers[#{i}].settings);
-
-        float adjustedAlpha = cosineFactor * colorSample.a;
-        // Filter to night side
-        vec4 newColor = vec4(cosineFactor * colorSample.xyz, adjustedAlpha);
-
-        color = blendNightLayers#{i}(color, newColor, adjustedAlpha);
-    }
-    #endfor
-
-    return color;
-}
-
-vec4 calculateShadedColor(vec4 currentColor, vec3 ellipsoidNormalCameraSpace,
-                          vec3 lightDirectionCameraSpace, vec3 viewDirectionCameraSpace,
-                          float roughness)
-{
-    vec3 shadedColor = currentColor.rgb * 0.05;
-
-    vec3 n = normalize(ellipsoidNormalCameraSpace);
-
-    float power = orenNayarDiffuse(
-        -lightDirectionCameraSpace,
-        viewDirectionCameraSpace,
-        ellipsoidNormalCameraSpace,
-        roughness);
-
-    vec3 l = lightDirectionCameraSpace;
-    power = max(smoothstep(0.0f, 0.1f, max(dot(-l, n), 0.0f)) * power, 0.0f);
-
-    vec4 color = vec4(shadedColor + currentColor.rgb * power, currentColor.a);
-    return color;
-}
-
-vec4 calculateOverlay(vec4 currentColor, vec2 uv, vec3 levelWeights,
-                      Layer Overlays[NUMLAYERS_OVERLAY])
-{
-    vec4 color = currentColor;
-
-    // The shader compiler will remove unused code when variables are multiplied by
-    // a constant 0
-#if !OVERLAY_BLENDING_ENABLED
-    levelWeights = DefaultLevelWeights;
-#endif // OVERLAY_BLENDING_ENABLED
-
-    #for i in 0..#{lastLayerIndexOverlays}
-    {
-        vec4 colorSample = getSampleOverlays#{i}(uv, levelWeights, Overlays);
-        colorSample = performAdjustmentOverlays#{i}(colorSample, Overlays[#{i}].adjustment);
-
-        colorSample = performLayerSettings(colorSample, Overlays[#{i}].settings);
-
-        color = blendNormal(color, colorSample);
-        color = blendOverlays#{i}(color, colorSample, 1.0);
-    }
-    #endfor
-
-    return color;
-}
-
-vec4 calculateWater(vec4 currentColor, vec2 uv, vec3 levelWeights, 
-                    Layer WaterMasks[NUMLAYERS_WATERMASK],
-                    vec3 ellipsoidNormalCameraSpace,
-                    vec3 lightDirectionCameraSpace, vec3 positionCameraSpace,
-                    out float reflectance)
-{
-    vec4 waterColor = vec4(0.0);
-
-    // The shader compiler will remove unused code when variables are multiplied by
-    // a constant 0
-#if !WATERMASK_BLENDING_ENABLED
-    levelWeights = DefaultLevelWeights;
-#endif // WATERMASK_BLENDING_ENABLED
-
-    #for i in 0..#{lastLayerIndexWaterMasks}
-    {
-        vec4 colorSample = getSampleWaterMasks#{i}(uv, levelWeights, WaterMasks);
-        colorSample = performAdjustmentWaterMasks#{i}(colorSample, WaterMasks[#{i}].adjustment);
-
-        colorSample.a = performLayerSettings(colorSample.a, WaterMasks[#{i}].settings);
-
-        waterColor = blendWaterMasks#{i}(waterColor, colorSample, 1.0);
-    }
-    #endfor
-
-    vec3 directionToFragmentCameraSpace = normalize(positionCameraSpace - vec3(0, 0, 0));
-    vec3 reflectionDirectionCameraSpace = reflect(lightDirectionCameraSpace, ellipsoidNormalCameraSpace);
-    float cosineFactor = clamp(dot(-reflectionDirectionCameraSpace, directionToFragmentCameraSpace), 0, 1);
-    cosineFactor = pow(cosineFactor, 100);
-
-    const vec3 specularColor = vec3(1.0);
-    const float specularIntensity = 0.4;
-
-    vec3 specularTotal = specularColor * cosineFactor * specularIntensity * waterColor.a;
-
-    reflectance = waterColor.a;
-    //return blendNormal(currentColor, waterColor);
-    //return currentColor + vec4(specularTotal, 1);
-    return currentColor;
-}
-
-#endif // TEXTURETILEMAPPING_HGLSL
diff --git a/modules/globebrowsing/shaders/tile.hglsl b/modules/globebrowsing/shaders/tile.glsl
similarity index 78%
rename from modules/globebrowsing/shaders/tile.hglsl
rename to modules/globebrowsing/shaders/tile.glsl
index d074581c8c..7b2ce24ea4 100644
--- a/modules/globebrowsing/shaders/tile.hglsl
+++ b/modules/globebrowsing/shaders/tile.glsl
@@ -26,53 +26,53 @@
 #define TEXTURETILE_HGLSL
 
 struct TileDepthTransform {
-    float depthScale;
-    float depthOffset;
+  float depthScale;
+  float depthOffset;
 };
 
 struct TileUvTransform {
-    vec2 uvOffset;
-    vec2 uvScale;
+  vec2 uvOffset;
+  vec2 uvScale;
 };
 
 struct ChunkTile {
-    sampler2D textureSampler;
-    TileUvTransform uvTransform;
+  sampler2D textureSampler;
+  TileUvTransform uvTransform;
 };
 
 struct PixelPadding {
-    ivec2 startOffset;
-    ivec2 sizeDifference;
+  ivec2 startOffset;
+  ivec2 sizeDifference;
 };
 
 struct ChunkTilePile {
-    ChunkTile chunkTile0;
-    ChunkTile chunkTile1;
-    ChunkTile chunkTile2;
+  ChunkTile chunkTile0;
+  ChunkTile chunkTile1;
+  ChunkTile chunkTile2;
 };
 
 struct LayerSettings {
-    float opacity;
-    float gamma;
-    float multiplier;
-    float offset;
-    float valueBlending;
+  float opacity;
+  float gamma;
+  float multiplier;
+  float offset;
+  float valueBlending;
 };
 
 struct LayerAdjustment {
-    vec3 chromaKeyColor;
-    float chromaKeyTolerance;
+  vec3 chromaKeyColor;
+  float chromaKeyTolerance;
 };
 
 struct Layer {
-    ChunkTilePile pile;
-    TileDepthTransform depthTransform;
-    LayerSettings settings;
-    LayerAdjustment adjustment;
-    PixelPadding padding;
-    
-    // Other layer type properties stuff
-    vec3 color;
+  ChunkTilePile pile;
+  TileDepthTransform depthTransform;
+  LayerSettings settings;
+  LayerAdjustment adjustment;
+  PixelPadding padding;
+  
+  // Other layer type properties stuff
+  vec3 color;
 };
 
 #endif // TEXTURETILE_HGLSL
diff --git a/modules/globebrowsing/shaders/tileheight.hglsl b/modules/globebrowsing/shaders/tileheight.glsl
similarity index 66%
rename from modules/globebrowsing/shaders/tileheight.hglsl
rename to modules/globebrowsing/shaders/tileheight.glsl
index 47865f9bb5..64f026c328 100644
--- a/modules/globebrowsing/shaders/tileheight.hglsl
+++ b/modules/globebrowsing/shaders/tileheight.glsl
@@ -26,16 +26,15 @@
 #define TILE_HEIGHT_HGLSL
 
 #include "PowerScaling/powerScaling_vs.hglsl"
-
-#include <${MODULE_GLOBEBROWSING}/shaders/tile.hglsl>
+#include <${MODULE_GLOBEBROWSING}/shaders/tile.glsl>
 
 #ifndef USE_HEIGHTMAP
 #define USE_HEIGHTMAP #{useAccurateNormals}
-#endif //USE_HEIGHTMAP
+#endif // USE_HEIGHTMAP
 
 #ifndef USE_ACCURATE_NORMALS
 #define USE_ACCURATE_NORMALS #{useAccurateNormals}
-#endif //USE_ACCURATE_NORMALS
+#endif // USE_ACCURATE_NORMALS
 
 #if USE_HEIGHTMAP
 uniform Layer HeightLayers[NUMLAYERS_HEIGHTMAP];
@@ -48,42 +47,38 @@ uniform float deltaTheta1;
 uniform float deltaPhi0;
 uniform float deltaPhi1;
 uniform float tileDelta;
-#endif //USE_ACCURATE_NORMALS && USE_HEIGHTMAP
+#endif // USE_ACCURATE_NORMALS && USE_HEIGHTMAP
 
+// levelWeights := Variable to determine which texture to sample from
+// HeightLayers := Three textures to sample from
 float getUntransformedTileHeight(vec2 uv, vec3 levelWeights) {
-    float height = CHUNK_DEFAULT_HEIGHT;
+  float height = CHUNK_DEFAULT_HEIGHT;
 
 #if USE_HEIGHTMAP
-    // Calculate desired level based on distance to the vertex on the ellipsoid
-    // Before any heightmapping is done
-    height = calculateUntransformedHeight(
-        uv,
-        levelWeights, // Variable to determine which texture to sample from
-        HeightLayers  // Three textures to sample from
-    );
+  // Calculate desired level based on distance to the vertex on the ellipsoid before any
+  // heightmapping is done.
+  height = calculateUntransformedHeight(uv, levelWeights, HeightLayers);
 #endif // USE_HEIGHTMAP
 
     return height;
 }
 
+// levelWeights := Variable to determine which texture to sample from
+// HeightLayers := Three textures to sample from
 float getTileHeight(vec2 uv, vec3 levelWeights) {
-    float height = CHUNK_DEFAULT_HEIGHT;
+  float height = CHUNK_DEFAULT_HEIGHT;
 
 #if USE_HEIGHTMAP
-    // Calculate desired level based on distance to the vertex on the ellipsoid
-    // Before any heightmapping is done
-    height = calculateHeight(
-        uv,
-        levelWeights, // Variable to determine which texture to sample from
-        HeightLayers  // Three textures to sample from
-    );
+  // Calculate desired level based on distance to the vertex on the ellipsoid before any
+  // heightmapping is done
+  height = calculateHeight(uv, levelWeights, HeightLayers);
 #endif // USE_HEIGHTMAP
 
     return height;
 }
 
 float getTileHeightScaled(vec2 uv, vec3 levelWeights) {
-    float height = getTileHeight(uv, levelWeights);
+  float height = getTileHeight(uv, levelWeights);
     
 #if USE_HEIGHTMAP
     height *= heightScale;
@@ -96,25 +91,25 @@ vec3 getTileNormal(vec2 uv, vec3 levelWeights, vec3 ellipsoidNormalCameraSpace,
                    vec3 ellipsoidTangentThetaCameraSpace,
                    vec3 ellipsoidTangentPhiCameraSpace)
 {
-    vec3 normal = ellipsoidNormalCameraSpace;
+  vec3 normal = ellipsoidNormalCameraSpace;
 
 #if USE_ACCURATE_NORMALS
-    float deltaPhi = mix(deltaPhi0, deltaPhi1, uv.x);
-    float deltaTheta = mix(deltaTheta0, deltaTheta1, uv.y);
+  float deltaPhi = mix(deltaPhi0, deltaPhi1, uv.x);
+  float deltaTheta = mix(deltaTheta0, deltaTheta1, uv.y);
 
-    vec3 deltaPhiVec = ellipsoidTangentPhiCameraSpace * deltaPhi;
-    vec3 deltaThetaVec = ellipsoidTangentThetaCameraSpace * deltaTheta;
+  vec3 deltaPhiVec = ellipsoidTangentPhiCameraSpace * deltaPhi;
+  vec3 deltaThetaVec = ellipsoidTangentThetaCameraSpace * deltaTheta;
 
-    float height00 = getTileHeightScaled(uv, levelWeights);
-    float height10 = getTileHeightScaled(uv + vec2(tileDelta, 0.0f), levelWeights);
-    float height01 = getTileHeightScaled(uv + vec2(0.0f, tileDelta), levelWeights);
+  float height00 = getTileHeightScaled(uv, levelWeights);
+  float height10 = getTileHeightScaled(uv + vec2(tileDelta, 0.0), levelWeights);
+  float height01 = getTileHeightScaled(uv + vec2(0.0, tileDelta), levelWeights);
 
-    vec3 diffTheta = deltaThetaVec + ellipsoidNormalCameraSpace * (height10 - height00);
-    vec3 diffPhi = deltaPhiVec + ellipsoidNormalCameraSpace * (height01 - height00);
+  vec3 diffTheta = deltaThetaVec + ellipsoidNormalCameraSpace * (height10 - height00);
+  vec3 diffPhi = deltaPhiVec + ellipsoidNormalCameraSpace * (height01 - height00);
 
-    normal = normalize(cross(diffTheta, diffPhi));
+  normal = normalize(cross(diffTheta, diffPhi));
 #endif // USE_ACCURATE_NORMALS
-    return normal;
+  return normal;
 }
 
 #endif // TILE_HEIGHT_HGLSL
diff --git a/modules/globebrowsing/shaders/tilevertexskirt.hglsl b/modules/globebrowsing/shaders/tilevertexskirt.glsl
similarity index 89%
rename from modules/globebrowsing/shaders/tilevertexskirt.hglsl
rename to modules/globebrowsing/shaders/tilevertexskirt.glsl
index 37bcce883c..ac1bcccccc 100644
--- a/modules/globebrowsing/shaders/tilevertexskirt.hglsl
+++ b/modules/globebrowsing/shaders/tilevertexskirt.glsl
@@ -31,14 +31,14 @@ uniform int xSegments;
 uniform float skirtLength;
 
 bool tileVertexIsSkirtVertex() {
-    int vertexIDx = gl_VertexID % (xSegments + 3);
-    int vertexIDy = gl_VertexID / (xSegments + 3);
-    return vertexIDx == 0 || vertexIDy == 0 ||
-        vertexIDx == (xSegments + 2) || vertexIDy == (xSegments + 2);
+  int vertexIDx = gl_VertexID % (xSegments + 3);
+  int vertexIDy = gl_VertexID / (xSegments + 3);
+  return vertexIDx == 0 || vertexIDy == 0 ||
+         vertexIDx == (xSegments + 2) || vertexIDy == (xSegments + 2);
 }
 
 float getTileVertexSkirtLength() {
-    return tileVertexIsSkirtVertex() ? skirtLength : 0.0;
+  return tileVertexIsSkirtVertex() ? skirtLength : 0.0;
 }
 
 #endif // TILE_VERTEX_SKIRT_HGLSL
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index fe51c0fb9f..0369043f4f 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -78,9 +78,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItemGlobeLocation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "globebrowsing_dashboarditem_globelocation";
-    return doc;
+    return codegen::doc<Parameters>("globebrowsing_dashboarditem_globelocation");
 }
 
 DashboardItemGlobeLocation::DashboardItemGlobeLocation(
diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp
index 0e845581da..e41d0dbf0f 100644
--- a/modules/globebrowsing/src/gdalwrapper.cpp
+++ b/modules/globebrowsing/src/gdalwrapper.cpp
@@ -105,8 +105,11 @@ GdalWrapper::GdalWrapper(size_t maximumCacheSize, size_t maximumMaximumCacheSize
     addProperty(_gdalMaximumCacheSize);
 
     GDALAllRegister();
-    CPLSetConfigOption("GDAL_DATA", absPath("${MODULE_GLOBEBROWSING}/gdal_data").c_str());
-    CPLSetConfigOption("CPL_TMPDIR", absPath("${BASE}").c_str());
+    CPLSetConfigOption(
+        "GDAL_DATA",
+        absPath("${MODULE_GLOBEBROWSING}/gdal_data").string().c_str()
+    );
+    CPLSetConfigOption("CPL_TMPDIR", absPath("${BASE}").string().c_str());
     CPLSetConfigOption("GDAL_HTTP_UNSAFESSL", "YES");
 
     CPLSetConfigOption("GDAL_HTTP_TIMEOUT", "3"); // 3 seconds
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index 185dc0ce6b..7dbb215593 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -51,7 +51,6 @@ namespace {
     constexpr const char* _loggerCat = "GlobeLabels";
 
     constexpr const double LabelFadeOutLimitAltitudeMeters = 25000.0;
-    constexpr const double RangeAngularCoefConst = 0.8;
     constexpr const float MinOpacityValueConst = 0.009f;
 
     enum LabelRenderingAlignmentType {
@@ -61,106 +60,86 @@ namespace {
 
     constexpr int8_t CurrentCacheVersion = 1;
 
-    constexpr openspace::properties::Property::PropertyInfo LabelsInfo = {
-        "Labels",
-        "Labels Enabled",
-        "Enables and disables the rendering of labels on the globe surface from "
-        "the csv label file"
+    constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
+        "Enabled",
+        "Enabled",
+        "Enables and disables labels' rendering."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelsEnableInfo = {
-        "Enable",
-        "Enable",
-        "Enables and disables labels' rendering from the asset file."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo LabelsFontSizeInfo = {
-        "LabelsFontSize",
-        "Labels Font Size",
+    constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = {
+        "FontSize",
+        "Font Size",
         "Font size for the rendering labels. This is different fromt text size."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelsMaxSizeInfo = {
-        "LabelsMaxSize",
-        "Labels Maximum Text Size",
-        "Maximum label size"
+    constexpr openspace::properties::Property::PropertyInfo MinMaxSizeInfo = {
+        "MinMaxSize",
+        "Min/Max Text Size",
+        "Minimum and maximum label size, in pixels."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelsMinSizeInfo = {
-        "LabelsMinSize",
-        "Labels Minimum Text Size",
-        "Minimum label size"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo LabelsSizeInfo = {
+    constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
         "LabelsSize",
         "Labels Size",
-        "Labels Size"
+        "This value affects the size scale of the labels."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelsMinHeightInfo = {
-        "LabelsMinHeight",
-        "Labels Minimum Height",
-        "Labels Minimum Height"
+    constexpr openspace::properties::Property::PropertyInfo HeightOffsetInfo = {
+        "HeightOffset",
+        "Height Offset",
+        "This value moves the label away from the globe surface by the specified "
+        "distance (in meters)."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelsColorInfo = {
-        "LabelsColor",
-        "Labels Color",
-        "Labels Color"
+    constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
+        "Color",
+        "Color",
+        "The text color of the labels."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelsOpacityInfo = {
-        "LabelsOpacity",
-        "Labels Opacity",
-        "Labels Opacity"
+    constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
+        "Opacity",
+        "Opacity",
+        "The opacity of the labels."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo
-        LabelsFadeInStartingDistanceInfo =
-    {
-        "FadeInStartingDistance",
-        "Fade In Starting Distance for Labels",
-        "Fade In Starting Distance for Labels"
+    constexpr openspace::properties::Property::PropertyInfo FadeDistancesInfo = {
+        "FadeDistances",
+        "Fade-In Distances",
+        "The distances above the globe's surface at which the labels start fading in or "
+        "out, given in meters. The final distances are also adjusted by the specified "
+        "height offset."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo
-        LabelsFadeOutStartingDistanceInfo =
-    {
-        "FadeOutStartingDistance",
-        "Fade Out Starting Distance for Labels",
-        "Fade Out Starting Distance for Labels"
+    constexpr openspace::properties::Property::PropertyInfo FadeInEnabledInfo = {
+        "FadeInEnabled",
+        "Fade In Enabled",
+        "Sets whether the labels fade in when approaching the globe from a distance. If "
+        "false, no fading happens and the labels immediately has full opacity."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelsFadeInEnabledInfo = {
-        "LabelsFadeInEnabled",
-        "Labels fade In enabled",
-        "Labels fade In enabled"
+    constexpr openspace::properties::Property::PropertyInfo FadeOutEnabledInfo = {
+        "FadeOutEnabled",
+        "Fade Out Enabled",
+        "Sets whether the labels fade out when approaching the surface of the globe. If "
+        "false, no fading happens and the labels stays in full opacity."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelsFadeOutEnabledInfo = {
-        "LabelsFadeOutEnabled",
-        "Labels fade Out enabled",
-        "Labels fade Out enabled"
+    constexpr openspace::properties::Property::PropertyInfo DisableCullingInfo = {
+        "DisableCulling",
+        "Culling Disabled",
+        "Labels culling disabled."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo
-        LabelsDisableCullingEnabledInfo =
-    {
-        "LabelsDisableCullingEnabled",
-        "Labels culling disabled",
-        "Labels culling disabled"
+    constexpr openspace::properties::Property::PropertyInfo DistanceEPSInfo = {
+        "DistanceEPS",
+        "Culling Distance",
+        "Labels culling distance from globe's center."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelsDistanceEPSInfo = {
-        "LabelsDistanceEPS",
-        "Labels culling distance from globe's center",
-        "Labels culling distance from globe's center"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo LabelAlignmentOptionInfo = {
-        "LabelAlignmentOption",
-        "Label Alignment Option",
+    constexpr openspace::properties::Property::PropertyInfo AlignmentOptionInfo = {
+        "AlignmentOption",
+        "Alignment Option",
         "Labels are aligned horizontally or circularly related to the planet."
     };
 
@@ -168,57 +147,48 @@ namespace {
         // The path to the labels file
         std::optional<std::filesystem::path> fileName;
 
-        // [[codegen::verbatim(LabelsInfo.description)]]
-        std::optional<bool> labels;
+        // [[codegen::verbatim(EnabledInfo.description)]]
+        std::optional<bool> enabled;
 
-        // [[codegen::verbatim(LabelsEnableInfo.description)]]
-        std::optional<bool> enable;
+        // [[codegen::verbatim(FontSizeInfo.description)]]
+        std::optional<float> fontSize;
 
-        // [[codegen::verbatim(LabelsFontSizeInfo.description)]]
-        std::optional<float> labelsFontSize;
+        // [[codegen::verbatim(MinMaxSizeInfo.description)]]
+        std::optional<glm::ivec2> minMaxSize;
 
-        // [[codegen::verbatim(LabelsMinSizeInfo.description)]]
-        std::optional<int> labelsMinSize;
+        // [[codegen::verbatim(SizeInfo.description)]]
+        std::optional<float> size;
 
-        // [[codegen::verbatim(LabelsMaxSizeInfo.description)]]
-        std::optional<int> labelsMaxSize;
+        // [[codegen::verbatim(HeightOffsetInfo.description)]]
+        std::optional<float> heightOffset;
 
-        // [[codegen::verbatim(LabelsSizeInfo.description)]]
-        std::optional<float> labelsSize;
+        // [[codegen::verbatim(ColorInfo.description)]]
+        std::optional<glm::vec3> color [[codegen::color()]];
 
-        // [[codegen::verbatim(LabelsMinHeightInfo.description)]]
-        std::optional<float> labelsMinHeight;
+        // [[codegen::verbatim(OpacityInfo.description)]]
+        std::optional<float> opacity [[codegen::inrange(0.f, 1.f)]];
 
-        // [[codegen::verbatim(LabelsColorInfo.description)]]
-        std::optional<glm::vec3> labelsColor [[codegen::color()]];
+        // [[codegen::verbatim(FadeDistancesInfo.description)]]
+        std::optional<glm::vec2> fadeDistances;
 
-        // [[codegen::verbatim(LabelsOpacityInfo.description)]]
-        std::optional<float> labelsOpacity [[codegen::inrange(0.f, 1.0)]];
+        // [[codegen::verbatim(FadeInEnabledInfo.description)]]
+        std::optional<bool> fadeInEnabled;
 
-        // [[codegen::verbatim(LabelsFadeInStartingDistanceInfo.description)]]
-        std::optional<float> fadeInStartingDistance;
+        // [[codegen::verbatim(FadeOutEnabledInfo.description)]]
+        std::optional<bool> fadeOutEnabled;
 
-        // [[codegen::verbatim(LabelsFadeOutStartingDistanceInfo.description)]]
-        std::optional<float> fadeOutStartingDistance;
+        // [[codegen::verbatim(DisableCullingInfo.description)]]
+        std::optional<bool> disableCulling;
 
-        // [[codegen::verbatim(LabelsFadeInEnabledInfo.description)]]
-        std::optional<bool> labelsFadeInEnabled;
-
-        // [[codegen::verbatim(LabelsFadeOutEnabledInfo.description)]]
-        std::optional<bool> labelsFadeOutEnabled;
-
-        // [[codegen::verbatim(LabelsDisableCullingEnabledInfo.description)]]
-        std::optional<bool> labelsDisableCullingEnabled;
-
-        // [[codegen::verbatim(LabelsDistanceEPSInfo.description)]]
-        std::optional<float> labelsDistanceEPS;
+        // [[codegen::verbatim(DistanceEPSInfo.description)]]
+        std::optional<float> distanceEPS;
 
         enum class Alignment {
             Horizontally,
             Circularly
         };
-        // [[codegen::verbatim(LabelAlignmentOptionInfo.description)]]
-        std::optional<Alignment> labelAlignmentOption;
+        // [[codegen::verbatim(AlignmentOptionInfo.description)]]
+        std::optional<Alignment> alignmentOption;
     };
 #include "globelabelscomponent_codegen.cpp"
 } // namespace
@@ -226,56 +196,54 @@ namespace {
 namespace openspace {
 
 documentation::Documentation GlobeLabelsComponent::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "globebrowsing_globelabelscomponent";
-    return doc;
+    return codegen::doc<Parameters>("globebrowsing_globelabelscomponent");
 }
 
 GlobeLabelsComponent::GlobeLabelsComponent()
     : properties::PropertyOwner({ "Labels" })
-    , _labelsEnabled(LabelsInfo, false)
-    , _labelsFontSize(LabelsFontSizeInfo, 30, 1, 300)
-    , _labelsMaxSize(LabelsMaxSizeInfo, 300, 10, 1000)
-    , _labelsMinSize(LabelsMinSizeInfo, 4, 1, 100)
-    , _labelsSize(LabelsSizeInfo, 2.5, 0, 30)
-    , _labelsMinHeight(LabelsMinHeightInfo, 100.0, 0.0, 10000.0)
-    , _labelsColor(
-        LabelsColorInfo,
-        glm::vec3(1.f, 1.f, 0.f),
-        glm::vec3(0.f),
-        glm::vec3(1.f)
+    , _enabled(EnabledInfo, false)
+    , _fontSize(FontSizeInfo, 30, 1, 300)
+    , _minMaxSize(MinMaxSizeInfo, glm::ivec2(1, 1000), glm::ivec2(1), glm::ivec2(1000))
+    , _size(SizeInfo, 2.5, 0, 30)
+    , _heightOffset(HeightOffsetInfo, 100.0, 0.0, 10000.0)
+    , _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(1e4, 1e6),
+        glm::vec2(1.f),
+        glm::vec2(1e8)
     )
-    , _labelsOpacity(LabelsOpacityInfo, 1.f, 0.f, 1.f)
-    , _labelsFadeInDist(LabelsFadeInStartingDistanceInfo, 1e6, 1e3, 1e8)
-    , _labelsFadeOutDist(LabelsFadeOutStartingDistanceInfo, 1e4, 1, 1e7)
-    , _labelsFadeInEnabled(LabelsFadeInEnabledInfo, false)
-    , _labelsFadeOutEnabled(LabelsFadeOutEnabledInfo, false)
-    , _labelsDisableCullingEnabled(LabelsDisableCullingEnabledInfo, false)
-    , _labelsDistanceEPS(LabelsDistanceEPSInfo, 100000.f, 1000.f, 10000000.f)
-    , _labelAlignmentOption(
-        LabelAlignmentOptionInfo,
+    , _fadeInEnabled(FadeInEnabledInfo, false)
+    , _fadeOutEnabled(FadeOutEnabledInfo, false)
+    , _disableCulling(DisableCullingInfo, false)
+    , _distanceEPS(DistanceEPSInfo, 100000.f, 1000.f, 10000000.f)
+    , _alignmentOption(
+        AlignmentOptionInfo,
         properties::OptionProperty::DisplayType::Dropdown
     )
 {
-    addProperty(_labelsEnabled);
-    addProperty(_labelsFontSize);
-    addProperty(_labelsSize);
-    addProperty(_labelsMinHeight);
-    _labelsColor.setViewOption(properties::Property::ViewOptions::Color);
-    addProperty(_labelsColor);
-    addProperty(_labelsOpacity);
-    addProperty(_labelsFadeInDist);
-    addProperty(_labelsFadeOutDist);
-    addProperty(_labelsMinSize);
-    addProperty(_labelsFadeInEnabled);
-    addProperty(_labelsFadeOutEnabled);
-    addProperty(_labelsDisableCullingEnabled);
-    addProperty(_labelsDistanceEPS);
+    addProperty(_enabled);
+    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);
 
-    _labelAlignmentOption.addOption(Horizontally, "Horizontally");
-    _labelAlignmentOption.addOption(Circularly, "Circularly");
-    _labelAlignmentOption = Horizontally;
-    addProperty(_labelAlignmentOption);
+    _alignmentOption.addOption(Horizontally, "Horizontally");
+    _alignmentOption.addOption(Circularly, "Circularly");
+    _alignmentOption = Horizontally;
+    addProperty(_alignmentOption);
 }
 
 void GlobeLabelsComponent::initialize(const ghoul::Dictionary& dictionary,
@@ -289,35 +257,37 @@ void GlobeLabelsComponent::initialize(const ghoul::Dictionary& dictionary,
         return;
     }
 
-    const bool loadSuccess = loadLabelsData(absPath(p.fileName->string()));
+    const bool loadSuccess = loadLabelsData(absPath(p.fileName->string()).string());
     if (!loadSuccess) {
         return;
     }
 
-    _labelsEnabled = p.enable.value_or(true);
-    _labelsFontSize = p.labelsFontSize.value_or(_labelsFontSize);
-    _labelsFontSize.onChange([this]() { initializeFonts(); });
-    _labelsSize = p.labelsSize.value_or(_labelsSize);
-    _labelsMinHeight = p.labelsMinHeight.value_or(_labelsMinHeight);
-    _labelsColor = p.labelsColor.value_or(_labelsColor);
-    _labelsOpacity = p.labelsOpacity.value_or(_labelsOpacity);
-    _labelsFadeInEnabled = p.labelsFadeInEnabled.value_or(_labelsFadeInEnabled);
-    _labelsFadeInDist = p.fadeInStartingDistance.value_or(_labelsFadeInDist);
-    _labelsFadeOutEnabled = p.labelsFadeOutEnabled.value_or(_labelsFadeOutEnabled);
-    _labelsFadeOutDist = p.fadeOutStartingDistance.value_or(_labelsFadeOutDist);
-    _labelsMinSize = p.labelsMinSize.value_or(_labelsMinSize);
-    _labelsMaxSize = p.labelsMaxSize.value_or(_labelsMaxSize);
-    _labelsDisableCullingEnabled =
-        p.labelsDisableCullingEnabled.value_or(_labelsDisableCullingEnabled);
-    _labelsDistanceEPS = p.labelsDistanceEPS.value_or(_labelsDistanceEPS);
+    _enabled = p.enabled.value_or(_enabled);
+    _fontSize = p.fontSize.value_or(_fontSize);
+    _fontSize.onChange([this]() { initializeFonts(); });
 
-    if (p.labelAlignmentOption.has_value()) {
-        switch (*p.labelAlignmentOption) {
+    // @TODO (emmbr, 2021-05-31): Temporarily set as read only, to avoid errors from font
+    // rendering (avoid filling font atlas)
+    _fontSize.setReadOnly(true);
+
+    _size = p.size.value_or(_size);
+    _heightOffset = p.heightOffset.value_or(_heightOffset);
+    _color = p.color.value_or(_color);
+    _opacity = p.opacity.value_or(_opacity);
+    _fadeInEnabled = p.fadeInEnabled.value_or(_fadeInEnabled);
+    _fadeOutEnabled = p.fadeOutEnabled.value_or(_fadeOutEnabled);
+    _fadeDistances = p.fadeDistances.value_or(_fadeDistances);
+    _minMaxSize = p.minMaxSize.value_or(_minMaxSize);
+    _disableCulling = p.disableCulling.value_or(_disableCulling);
+    _distanceEPS = p.distanceEPS.value_or(_distanceEPS);
+
+    if (p.alignmentOption.has_value()) {
+        switch (*p.alignmentOption) {
             case Parameters::Alignment::Horizontally:
-                _labelAlignmentOption = Horizontally;
+                _alignmentOption = Horizontally;
                 break;
             case Parameters::Alignment::Circularly:
-                _labelAlignmentOption = Circularly;
+                _alignmentOption = Circularly;
                 break;
             default:
                 throw ghoul::MissingCaseException();
@@ -330,20 +300,19 @@ void GlobeLabelsComponent::initialize(const ghoul::Dictionary& dictionary,
 void GlobeLabelsComponent::initializeFonts() {
     _font = openspace::global::fontManager->font(
         "Mono",
-        static_cast<float>(_labelsFontSize),
+        static_cast<float>(_fontSize),
         ghoul::fontrendering::FontManager::Outline::Yes,
-        ghoul::fontrendering::FontManager::LoadGlyphs::No
+        ghoul::fontrendering::FontManager::LoadGlyphs::Yes
     );
 }
 
 bool GlobeLabelsComponent::loadLabelsData(const std::string& file) {
     std::string cachedFile = FileSys.cacheManager()->cachedFilename(
-        ghoul::filesystem::File(file),
-        "GlobeLabelsComponent|" + identifier(),
-        ghoul::filesystem::CacheManager::Persistent::Yes
+        file,
+        "GlobeLabelsComponent|" + identifier()
     );
 
-    bool hasCachedFile = FileSys.fileExists(cachedFile);
+    bool hasCachedFile = std::filesystem::is_regular_file(cachedFile);
     if (hasCachedFile) {
         LINFO(fmt::format("Cached file '{}' used for labels file: {}", cachedFile, file));
 
@@ -476,7 +445,9 @@ bool GlobeLabelsComponent::loadCachedFile(const std::string& file) {
     if (version != CurrentCacheVersion) {
         LINFO("The format of the cached file has changed: deleting old cache");
         fileStream.close();
-        FileSys.deleteFile(file);
+        if (std::filesystem::is_regular_file(file)) {
+            std::filesystem::remove(file);
+        }
         return false;
     }
 
@@ -498,8 +469,7 @@ bool GlobeLabelsComponent::saveCachedFile(const std::string& file) const {
         LERROR(fmt::format("Error opening file '{}' for save cache file", file));
         return false;
     }
-    fileStream.write(reinterpret_cast<const char*>(&CurrentCacheVersion),
-        sizeof(int8_t));
+    fileStream.write(reinterpret_cast<const char*>(&CurrentCacheVersion), sizeof(int8_t));
 
     int32_t nValues = static_cast<int32_t>(_labels.labelsArray.size());
     if (nValues == 0) {
@@ -515,7 +485,7 @@ bool GlobeLabelsComponent::saveCachedFile(const std::string& file) const {
 }
 
 void GlobeLabelsComponent::draw(const RenderData& data) {
-    if (!_labelsEnabled) {
+    if (!_enabled) {
         return;
     }
 
@@ -525,21 +495,19 @@ void GlobeLabelsComponent::draw(const RenderData& data) {
                     viewTransform;
     glm::dmat4 mvp = vp * _globe->modelTransform();
 
-    glm::dvec3 globePositionWorld = glm::dvec3(_globe->modelTransform() *
-                                    glm::vec4(0.f, 0.f, 0.f, 1.f));
-    glm::dvec3 cameraToGlobeDistanceWorld = globePositionWorld -
-                                            data.camera.positionVec3();
-    double distanceCameraGlobeWorld = glm::length(cameraToGlobeDistanceWorld);
+    glm::dvec3 globePosWorld =
+        glm::dvec3(_globe->modelTransform() * glm::vec4(0.f, 0.f, 0.f, 1.f));
+    glm::dvec3 cameraToGlobeWorld = globePosWorld - data.camera.positionVec3();
+    double distanceCameraGlobeWorld = glm::length(cameraToGlobeWorld);
 
     float varyingOpacity = 1.f;
 
-    double averageRadius = (
-        _globe->ellipsoid().radii().x + _globe->ellipsoid().radii().y +
-        _globe->ellipsoid().radii().z
-    ) / 3.0;
-    if (_labelsFadeInEnabled) {
-        glm::dvec2 fadeRange = glm::dvec2(averageRadius + _labelsMinHeight);
-        fadeRange.x += _labelsFadeInDist;
+    const glm::dvec3 globeRadii = _globe->ellipsoid().radii();
+    double averageRadius = (globeRadii.x + globeRadii.y + globeRadii.z) / 3.0;
+
+    if (_fadeInEnabled) {
+        glm::dvec2 fadeRange = glm::dvec2(averageRadius + _heightOffset);
+        fadeRange.x += _fadeDistances.value().y;
         double a = 1.0 / (fadeRange.y - fadeRange.x);
         double b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
         double funcValue = a * distanceCameraGlobeWorld + b;
@@ -550,11 +518,11 @@ void GlobeLabelsComponent::draw(const RenderData& data) {
         }
     }
 
-    if (_labelsFadeOutEnabled) {
+    if (_fadeOutEnabled) {
         glm::dvec2 fadeRange = glm::dvec2(
-            averageRadius + _labelsMinHeight + LabelFadeOutLimitAltitudeMeters
+            averageRadius + _heightOffset + LabelFadeOutLimitAltitudeMeters
         );
-        fadeRange.x += _labelsFadeOutDist;
+        fadeRange.x += _fadeDistances.value().x;
         double a = 1.0 / (fadeRange.x - fadeRange.y);
         double b = -(fadeRange.y / (fadeRange.x - fadeRange.y));
         double funcValue = a * distanceCameraGlobeWorld + b;
@@ -570,12 +538,11 @@ void GlobeLabelsComponent::draw(const RenderData& data) {
 
 void GlobeLabelsComponent::renderLabels(const RenderData& data,
                                         const glm::dmat4& modelViewProjectionMatrix,
-                                        float distToCamera,
-                                        float fadeInVariable
+                                        float distToCamera, float fadeInVariable
 ) {
     glm::vec4 textColor = glm::vec4(
-        glm::vec3(_labelsColor),
-        _labelsOpacity * fadeInVariable
+        glm::vec3(_color),
+        _opacity * fadeInVariable
     );
 
     glm::dmat4 VP = glm::dmat4(data.camera.sgctInternal.projectionMatrix()) *
@@ -609,11 +576,11 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
         double distanceCameraToLabelWorld =
             glm::length(locationPositionWorld - data.camera.positionVec3());
 
-        if (_labelsDisableCullingEnabled ||
-            ((distToCamera > (distanceCameraToLabelWorld + _labelsDistanceEPS)) &&
+        if (_disableCulling ||
+            ((distToCamera > (distanceCameraToLabelWorld + _distanceEPS)) &&
             isLabelInFrustum(VP, locationPositionWorld)))
         {
-            if (_labelAlignmentOption == Circularly) {
+            if (_alignmentOption == Circularly) {
                 glm::dvec3 labelNormalObj = glm::dvec3(
                     invModelMatrix * glm::dvec4(data.camera.positionVec3(), 1.0)
                 ) - glm::dvec3(position);
@@ -634,18 +601,19 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
                 orthoUp = glm::normalize(glm::cross(labelNormalObj, orthoRight));
             }
 
-            position += _labelsMinHeight;
+            // Move the position along the normal. Note that position is in model space
+            position += _heightOffset.value() * glm::normalize(position);
 
             ghoul::fontrendering::FontRenderer::ProjectedLabelsInformation labelInfo;
             labelInfo.orthoRight = orthoRight;
             labelInfo.orthoUp = orthoUp;
-            labelInfo.minSize = _labelsMinSize;
-            labelInfo.maxSize = _labelsMaxSize;
+            labelInfo.minSize = _minMaxSize.value().x;
+            labelInfo.maxSize = _minMaxSize.value().y;
             labelInfo.cameraPos = data.camera.positionVec3();
             labelInfo.cameraLookUp = data.camera.lookUpVectorWorldSpace();
             labelInfo.renderType = 0;
             labelInfo.mvpMatrix = modelViewProjectionMatrix;
-            labelInfo.scale = powf(2.f, _labelsSize);
+            labelInfo.scale = powf(2.f, _size);
             labelInfo.enableDepth = true;
             labelInfo.enableFalseDepth = true;
             labelInfo.disableTransmittance = true;
@@ -672,7 +640,6 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
 bool GlobeLabelsComponent::isLabelInFrustum(const glm::dmat4& MVMatrix,
                                             const glm::dvec3& position) const
 {
-
     // Frustum Planes
     glm::dvec3 col1(MVMatrix[0][0], MVMatrix[1][0], MVMatrix[2][0]);
     glm::dvec3 col2(MVMatrix[0][1], MVMatrix[1][1], MVMatrix[2][1]);
@@ -736,10 +703,6 @@ bool GlobeLabelsComponent::isLabelInFrustum(const glm::dmat4& MVMatrix,
     else if ((glm::dot(nearNormal, position) + nearDistance) < -Radius) {
         return false;
     }
-    // The far plane testing is disabled because the atm has no depth.
-    /*else if ((glm::dot(farNormal, position) + farDistance) < -Radius) {
-    return false;
-    }*/
 
     return true;
 }
diff --git a/modules/globebrowsing/src/globelabelscomponent.h b/modules/globebrowsing/src/globelabelscomponent.h
index ce56c80b0d..a14ede7078 100644
--- a/modules/globebrowsing/src/globelabelscomponent.h
+++ b/modules/globebrowsing/src/globelabelscomponent.h
@@ -31,6 +31,8 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
+#include <openspace/properties/vector/ivec2property.h>
+#include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <ghoul/font/fontrenderer.h>
 #include <ghoul/glm.h>
@@ -68,7 +70,6 @@ private:
         float distToCamera, float fadeInVariable);
     bool isLabelInFrustum(const glm::dmat4& MVMatrix, const glm::dvec3& position) const;
 
-private:
     // Labels Structures
     struct LabelEntry {
         char feature[256];
@@ -83,30 +84,29 @@ private:
         std::vector<LabelEntry> labelsArray;
     };
 
-    properties::BoolProperty _labelsEnabled;
-    properties::FloatProperty _labelsFontSize;
-    properties::IntProperty _labelsMaxSize;
-    properties::IntProperty _labelsMinSize;
-    properties::FloatProperty _labelsSize;
-    properties::FloatProperty _labelsMinHeight;
-    properties::Vec3Property _labelsColor;
-    properties::FloatProperty _labelsOpacity;
-    properties::FloatProperty _labelsFadeInDist;
-    properties::FloatProperty _labelsFadeOutDist;
-    properties::BoolProperty _labelsFadeInEnabled;
-    properties::BoolProperty _labelsFadeOutEnabled;
-    properties::BoolProperty _labelsDisableCullingEnabled;
-    properties::FloatProperty _labelsDistanceEPS;
-    properties::OptionProperty _labelAlignmentOption;
+    properties::BoolProperty _enabled;
+    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;
+    properties::BoolProperty _disableCulling;
+    properties::FloatProperty _distanceEPS;
+    properties::OptionProperty _alignmentOption;
 
-private:
     Labels _labels;
 
     // Font
     std::shared_ptr<ghoul::fontrendering::Font> _font;
 
     // Globe
-    globebrowsing::RenderableGlobe* _globe;
+    globebrowsing::RenderableGlobe* _globe = nullptr;
 };
 
 } // namespace openspace
diff --git a/modules/globebrowsing/src/globetranslation.cpp b/modules/globebrowsing/src/globetranslation.cpp
index 6056b81a52..d1097c35de 100644
--- a/modules/globebrowsing/src/globetranslation.cpp
+++ b/modules/globebrowsing/src/globetranslation.cpp
@@ -98,9 +98,7 @@ namespace {
 namespace openspace::globebrowsing {
 
 documentation::Documentation GlobeTranslation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_translation_globetranslation";
-    return doc;
+    return codegen::doc<Parameters>("space_translation_globetranslation");
 }
 
 GlobeTranslation::GlobeTranslation(const ghoul::Dictionary& dictionary)
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 43039ef251..0d9e4fbb45 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -179,9 +179,7 @@ namespace {
 } // namespace
 
 documentation::Documentation Layer::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "globebrowsing_layer";
-    return doc;
+    return codegen::doc<Parameters>("globebrowsing_layer");
 }
 
 Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict,
diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp
index 512fdaf88d..ac9da38447 100644
--- a/modules/globebrowsing/src/layeradjustment.cpp
+++ b/modules/globebrowsing/src/layeradjustment.cpp
@@ -70,9 +70,7 @@ namespace {
 namespace openspace::globebrowsing {
 
 documentation::Documentation LayerAdjustment::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "globebrowsing_layeradjustment";
-    return doc;
+    return codegen::doc<Parameters>("globebrowsing_layeradjustment");
 }
 
 LayerAdjustment::LayerAdjustment()
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index 81254ff64d..6b7b56951a 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -34,6 +34,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/exception.h>
 #include <ghoul/misc/profiling.h>
+#include <filesystem>
 
 #ifdef _MSC_VER
 #pragma warning (push)
@@ -450,7 +451,7 @@ void RawTileDataReader::initialize() {
     if (module.isWMSCachingEnabled()) {
         ZoneScopedN("WMS Caching")
         std::string c;
-        if (FileSys.fileExists(_datasetFilePath)) {
+        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);
@@ -486,7 +487,7 @@ void RawTileDataReader::initialize() {
                 CPLCreateXMLElementAndValue(
                     cache,
                     "Path",
-                    absPath(module.wmsCacheLocation()).c_str()
+                    absPath(module.wmsCacheLocation()).string().c_str()
                 );
                 CPLCreateXMLElementAndValue(cache, "Depth", "4");
                 CPLCreateXMLElementAndValue(cache, "Expires", "315576000"); // 10 years
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 39c561518f..02ef8d540c 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -34,6 +34,7 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
+#include <openspace/interaction/sessionrecording.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/scene.h>
@@ -107,62 +108,57 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo ShowChunkEdgeInfo = {
         "ShowChunkEdges",
         "Show chunk edges",
-        "" // @TODO Missing documentation
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ShowChunkBoundsInfo = {
-        "ShowChunkBounds",
-        "Show chunk bounds",
-        "" // @TODO Missing documentation
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo HeightResolutionInfo = {
-        "ShowHeightResolution",
-        "Show height resolution",
-        "" // @TODO Missing documentation
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo HeightIntensityInfo = {
-        "ShowHeightIntensities",
-        "Show height intensities",
-        "" // @TODO Missing documentation
+        "If this value is set to 'true', the borders between chunks are shown using a "
+        "red highlight"
     };
 
     constexpr openspace::properties::Property::PropertyInfo LevelProjectedAreaInfo = {
         "LevelByProjectedAreaElseDistance",
         "Level by projected area (else distance)",
-        "" // @TODO Missing documentation
+        "If this value is set to 'true', the tile level is determined by the area "
+        "projected on screen. If it is 'false', the distance to the center of the tile "
+        "is used instead."
     };
 
     constexpr openspace::properties::Property::PropertyInfo ResetTileProviderInfo = {
         "ResetTileProviders",
         "Reset tile providers",
-        "" // @TODO Missing documentation
+        "If this property is triggered, all tile provides for the globe are reset and "
+        "data is reloaded from scratch."
     };
 
     constexpr openspace::properties::Property::PropertyInfo ModelSpaceRenderingInfo = {
         "ModelSpaceRenderingCutoffLevel",
         "Model Space Rendering Cutoff Level",
-        "" // @TODO Missing documentation
+        "This value determines the tile level that is used as the cut off between "
+        "rendering tiles using the globe model rendering vs the flat in-game rendering "
+        "method. This value is a tradeoff between not having precision errors in the "
+        "rendering and represting a tile as flat or curved."
     };
 
     constexpr openspace::properties::Property::PropertyInfo DynamicLodIterationCountInfo =
     {
         "DynamicLodIterationCount",
         "Data availability checks before LOD factor impact",
-        "" // @TODO Missing documentation
+        "The number of checks that have to fail/succeed in a row before the dynamic "
+        "level-of-detail adjusts the actual level-of-detail up or down during a session "
+        "recording"
     };
 
     constexpr openspace::properties::Property::PropertyInfo PerformShadingInfo = {
         "PerformShading",
         "Perform shading",
-        "" // @TODO Missing documentation
+        "This value determines whether there should be lighting applied to the surface "
+        "of the globe. Note that if there is an atmosphere attached to the planet, there "
+        "is a separate setting to control the shadowing induced by the atmosphere part."
     };
 
     constexpr openspace::properties::Property::PropertyInfo AccurateNormalsInfo = {
         "UseAccurateNormals",
         "Use Accurate Normals",
-        "" // @TODO Missing documentation
+        "This value determines whether higher-accuracy normals should be used in the "
+        "rendering. These normals are calculated based on the height field information "
+        "and are thus only available if the planet has a height map"
     };
 
     constexpr openspace::properties::Property::PropertyInfo EclipseInfo = {
@@ -200,25 +196,22 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo TargetLodScaleFactorInfo = {
         "TargetLodScaleFactor",
         "Target Level of Detail Scale Factor",
-        "" // @TODO Missing documentation
+        "Determines the targeted level-of-detail of the tiles for this globe. A higher "
+        "value means that the tiles rendered are a higher resolution for the same "
+        "distance of the camera to the planet."
     };
 
     constexpr openspace::properties::Property::PropertyInfo CurrentLodScaleFactorInfo = {
         "CurrentLodScaleFactor",
         "Current Level of Detail Scale Factor (Read Only)",
-        "" // @TODO Missing documentation
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo CameraMinHeightInfo = {
-        "CameraMinHeight",
-        "Camera Minimum Height",
-        "" // @TODO Missing documentation
+        "The currently used scale factor whose target value is deteremined by "
+        "'TargetLodScaleFactor'."
     };
 
     constexpr openspace::properties::Property::PropertyInfo OrenNayarRoughnessInfo = {
         "OrenNayarRoughness",
         "orenNayarRoughness",
-        "" // @TODO Missing documentation
+        "The roughness factor that is used for the Oren-Nayar lighting mode"
     };
 
     constexpr openspace::properties::Property::PropertyInfo NActiveLayersInfo = {
@@ -497,18 +490,13 @@ Chunk::Chunk(const TileIndex& ti)
 {}
 
 documentation::Documentation RenderableGlobe::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "globebrowsing_renderableglobe";
-    return doc;
+    return codegen::doc<Parameters>("globebrowsing_renderableglobe");
 }
 
 RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _debugProperties({
         BoolProperty(ShowChunkEdgeInfo, false),
-        BoolProperty(ShowChunkBoundsInfo, false),
-        BoolProperty(HeightResolutionInfo, false),
-        BoolProperty(HeightIntensityInfo, false),
         BoolProperty(LevelProjectedAreaInfo, true),
         BoolProperty(ResetTileProviderInfo, false),
         IntProperty(ModelSpaceRenderingInfo, 14, 1, 22),
@@ -524,7 +512,6 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
         IntProperty(NumberShadowSamplesInfo, 5, 1, 7),
         FloatProperty(TargetLodScaleFactorInfo, 15.f, 1.f, 50.f),
         FloatProperty(CurrentLodScaleFactorInfo, 15.f, 1.f, 50.f),
-        FloatProperty(CameraMinHeightInfo, 100.f, 0.f, 1000.f),
         FloatProperty(OrenNayarRoughnessInfo, 0.f, 0.f, 1.f),
         IntProperty(NActiveLayersInfo, 0, 0, OpenGLCap.maxTextureUnits() / 3)
     })
@@ -605,16 +592,11 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     });
     addProperty(_generalProperties.targetLodScaleFactor);
     addProperty(_generalProperties.currentLodScaleFactor);
-    addProperty(_generalProperties.cameraMinHeight);
     addProperty(_generalProperties.orenNayarRoughness);
     _generalProperties.nActiveLayers.setReadOnly(true);
     addProperty(_generalProperties.nActiveLayers);
 
     _debugPropertyOwner.addProperty(_debugProperties.showChunkEdges);
-    //_debugPropertyOwner.addProperty(_debugProperties.showChunkBounds);
-    //_debugPropertyOwner.addProperty(_debugProperties.showChunkAABB);
-    //_debugPropertyOwner.addProperty(_debugProperties.showHeightResolution);
-    //_debugPropertyOwner.addProperty(_debugProperties.showHeightIntensities);
     _debugPropertyOwner.addProperty(_debugProperties.levelByProjectedAreaElseDistance);
     _debugPropertyOwner.addProperty(_debugProperties.resetTileProviders);
     _debugPropertyOwner.addProperty(_debugProperties.modelSpaceRenderingCutoffLevel);
@@ -628,8 +610,6 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     _generalProperties.eclipseHardShadows.onChange(notifyShaderRecompilation);
     _generalProperties.performShading.onChange(notifyShaderRecompilation);
     _debugProperties.showChunkEdges.onChange(notifyShaderRecompilation);
-    _debugProperties.showHeightResolution.onChange(notifyShaderRecompilation);
-    _debugProperties.showHeightIntensities.onChange(notifyShaderRecompilation);
 
     _layerManager.onChange([&](Layer* l) {
         _shadersNeedRecompilation = true;
@@ -745,13 +725,14 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
                 // Render from light source point of view
                 renderChunks(lightRenderData, rendererTask, {}, true);
                 if (_hasRings && _ringsComponent.isEnabled()) {
-                    _ringsComponent.draw(lightRenderData, RingsComponent::GeometryOnly);
+                    _ringsComponent.draw(
+                        lightRenderData,
+                        RingsComponent::RenderPass::GeometryOnly
+                    );
                 }
 
                 glEnable(GL_BLEND);
 
-                _shadowComponent.setViewDepthMap(false);
-
                 _shadowComponent.end();
 
                 // Render again from original point of view
@@ -759,7 +740,7 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
                 if (_hasRings && _ringsComponent.isEnabled()) {
                     _ringsComponent.draw(
                         data,
-                        RingsComponent::GeometryAndShading,
+                        RingsComponent::RenderPass::GeometryAndShading,
                         _shadowComponent.shadowMapData()
                     );
                 }
@@ -767,7 +748,10 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask
             else {
                 renderChunks(data, rendererTask);
                 if (_hasRings && _ringsComponent.isEnabled()) {
-                    _ringsComponent.draw(data, RingsComponent::GeometryAndShading);
+                    _ringsComponent.draw(
+                        data,
+                        RingsComponent::RenderPass::GeometryAndShading
+                    );
                 }
             }
         }
@@ -808,13 +792,6 @@ void RenderableGlobe::update(const UpdateData& data) {
 
         _localRenderer.program->setUniform("xSegments", _grid.xSegments);
 
-        if (_debugProperties.showHeightResolution) {
-            _localRenderer.program->setUniform(
-                "vertexResolution",
-                glm::vec2(_grid.xSegments, _grid.ySegments)
-            );
-        }
-
         ghoul::opengl::updateUniformLocations(
             *_localRenderer.program,
             _localRenderer.uniformCache,
@@ -827,12 +804,6 @@ void RenderableGlobe::update(const UpdateData& data) {
 
         _globalRenderer.program->setUniform("xSegments", _grid.xSegments);
 
-        if (_debugProperties.showHeightResolution) {
-            _globalRenderer.program->setUniform(
-                "vertexResolution",
-                glm::vec2(_grid.xSegments, _grid.ySegments)
-            );
-        }
         // Ellipsoid Radius (Model Space)
         _globalRenderer.program->setUniform(
             "radiiSquared",
@@ -1220,48 +1191,32 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
     }
     _localRenderer.program->deactivate();
 
-    if (_debugProperties.showChunkBounds) {
-        for (int i = 0; i < globalCount; ++i) {
-            debugRenderChunk(
-                *_globalChunkBuffer[i],
-                mvp,
-                _debugProperties.showChunkBounds
-            );
+    if (global::sessionRecording->isSavingFramesDuringPlayback()) {
+        // If our tile cache is very full, we assume we need to adjust the level of detail
+        // dynamically to not keep rendering frames with unavailable data
+        // After certain number of iterations(_debugProperties.dynamicLodIterationCount) of
+        // unavailable/available data in a row, we assume that a change could be made.
+        const int iterCount = _debugProperties.dynamicLodIterationCount;
+        const bool exceededIterations =
+            static_cast<int>(_iterationsOfUnavailableData) > iterCount;
+        const float clf = _generalProperties.currentLodScaleFactor;
+        const float clfMin = _generalProperties.currentLodScaleFactor.minValue();
+        const float targetLod = _generalProperties.targetLodScaleFactor;
+        const bool validLodFactor = clf > clfMin;
+        if (exceededIterations && validLodFactor) {
+            _generalProperties.currentLodScaleFactor =
+                _generalProperties.currentLodScaleFactor - 0.1f;
+            _iterationsOfUnavailableData = 0;
+            _lodScaleFactorDirty = true;
+        } // Make 2 times the iterations with available data to move it up again
+        else if (static_cast<int>(_iterationsOfAvailableData) >
+            (iterCount * 2) && clf < targetLod)
+        {
+            _generalProperties.currentLodScaleFactor =
+                _generalProperties.currentLodScaleFactor + 0.1f;
+            _iterationsOfAvailableData = 0;
+            _lodScaleFactorDirty = true;
         }
-
-        for (int i = 0; i < localCount; ++i) {
-            debugRenderChunk(
-                *_localChunkBuffer[i],
-                mvp,
-                _debugProperties.showChunkBounds
-            );
-        }
-    }
-
-    // If our tile cache is very full, we assume we need to adjust the level of detail
-    // dynamically to not keep rendering frames with unavailable data
-    // After certain number of iterations(_debugProperties.dynamicLodIterationCount) of
-    // unavailable/available data in a row, we assume that a change could be made.
-    const int iterCount = _debugProperties.dynamicLodIterationCount;
-    const bool exceededIterations =
-        static_cast<int>(_iterationsOfUnavailableData) > iterCount;
-    const float clf = _generalProperties.currentLodScaleFactor;
-    const float clfMin = _generalProperties.currentLodScaleFactor.minValue();
-    const float targetLod = _generalProperties.targetLodScaleFactor;
-    const bool validLodFactor = clf > clfMin;
-    if (exceededIterations && validLodFactor) {
-        _generalProperties.currentLodScaleFactor =
-            _generalProperties.currentLodScaleFactor - 0.1f;
-        _iterationsOfUnavailableData = 0;
-        _lodScaleFactorDirty = true;
-    } // Make 2 times the iterations with available data to move it up again
-    else if (static_cast<int>(_iterationsOfAvailableData) >
-             (iterCount * 2) && clf < targetLod)
-    {
-        _generalProperties.currentLodScaleFactor =
-            _generalProperties.currentLodScaleFactor + 0.1f;
-        _iterationsOfAvailableData = 0;
-        _lodScaleFactorDirty = true;
     }
 }
 
@@ -1658,12 +1613,8 @@ void RenderableGlobe::recompileShaders() {
         std::to_string(_generalProperties.shadowMapping)
     );
     pairs.emplace_back("showChunkEdges", std::to_string(_debugProperties.showChunkEdges));
-    pairs.emplace_back("showHeightResolution",
-        std::to_string(_debugProperties.showHeightResolution)
-    );
-    pairs.emplace_back("showHeightIntensities",
-        std::to_string(_debugProperties.showHeightIntensities)
-    );
+    pairs.emplace_back("showHeightResolution", "0");
+    pairs.emplace_back("showHeightIntensities", "0");
     pairs.emplace_back("defaultHeight", std::to_string(DefaultHeight));
 
 
@@ -1771,13 +1722,6 @@ void RenderableGlobe::recompileShaders() {
 
     _localRenderer.program->setUniform("xSegments", _grid.xSegments);
 
-    if (_debugProperties.showHeightResolution) {
-        _localRenderer.program->setUniform(
-            "vertexResolution",
-            glm::vec2(_grid.xSegments, _grid.ySegments)
-        );
-    }
-
     ghoul::opengl::updateUniformLocations(
         *_localRenderer.program,
         _localRenderer.uniformCache,
@@ -1799,12 +1743,6 @@ void RenderableGlobe::recompileShaders() {
 
     _globalRenderer.program->setUniform("xSegments", _grid.xSegments);
 
-    if (_debugProperties.showHeightResolution) {
-        _globalRenderer.program->setUniform(
-            "vertexResolution",
-            glm::vec2(_grid.xSegments, _grid.ySegments)
-        );
-    }
     // Ellipsoid Radius (Model Space)
     _globalRenderer.program->setUniform(
         "radiiSquared",
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index c1ce8d7a98..35247cefe7 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -123,9 +123,6 @@ private:
 
     struct {
         properties::BoolProperty showChunkEdges;
-        properties::BoolProperty showChunkBounds;
-        properties::BoolProperty showHeightResolution;
-        properties::BoolProperty showHeightIntensities;
         properties::BoolProperty levelByProjectedAreaElseDistance;
         properties::BoolProperty resetTileProviders;
         properties::IntProperty  modelSpaceRenderingCutoffLevel;
@@ -142,7 +139,6 @@ private:
         properties::IntProperty   nShadowSamples;
         properties::FloatProperty targetLodScaleFactor;
         properties::FloatProperty currentLodScaleFactor;
-        properties::FloatProperty cameraMinHeight;
         properties::FloatProperty orenNayarRoughness;
         properties::IntProperty   nActiveLayers;
     } _generalProperties;
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index e59917235b..c54bb66491 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -55,13 +55,13 @@ namespace {
     constexpr const char* _loggerCat = "RingsComponent";
 
     constexpr const std::array<const char*, 9> UniformNames = {
-        "modelViewProjectionMatrix", "textureOffset", "colorFilterValue", "_nightFactor",
+        "modelViewProjectionMatrix", "textureOffset", "colorFilterValue", "nightFactor",
         "sunPosition", "ringTexture", "shadowMatrix", "shadowMapTexture",
         "zFightingPercentage"
     };
 
     constexpr const std::array<const char*, 15> UniformNamesAdvancedRings = {
-        "modelViewProjectionMatrix", "textureOffset", "colorFilterValue", "_nightFactor",
+        "modelViewProjectionMatrix", "textureOffset", "colorFilterValue", "nightFactor",
         "sunPosition", "sunPositionObj", "camPositionObj", "ringTextureFwrd",
         "ringTextureBckwrd", "ringTextureUnlit", "ringTextureColor",
         "ringTextureTransparency", "shadowMatrix", "shadowMapTexture", "zFightingPercentage"
@@ -122,10 +122,10 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo OffsetInfo = {
         "Offset",
         "Offset",
-        "This value is used to limit the width of the rings.Each of the two values is a "
-        "value between 0 and 1, where 0 is the center of the ring and 1 is the maximum "
-        "extent at the radius. If this value is, for example {0.5, 1.0}, the ring is "
-        "only shown between radius/2 and radius. It defaults to {0.0, 1.0}."
+        "This value is used to limit the width of the rings. Each of the two values is "
+        "a value between 0 and 1, where 0 is the center of the ring and 1 is the "
+        "maximum extent at the radius. For example, if the value is {0.5, 1.0}, the "
+        "ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}."
     };
 
     constexpr openspace::properties::Property::PropertyInfo NightFactorInfo = {
@@ -200,9 +200,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RingsComponent::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "globebrowsing_rings_component";
-    return doc;
+    return codegen::doc<Parameters>("globebrowsing_rings_component");
 }
 
 RingsComponent::RingsComponent(const ghoul::Dictionary& dictionary)
@@ -251,60 +249,63 @@ void RingsComponent::initialize() {
 
     addProperty(_enabled);
 
-    _size.setViewOption(properties::Property::ViewOptions::Logarithmic);
+    _size.setExponent(15.f);
     _size = p.size.value_or(_size);
     _size.onChange([&]() { _planeIsDirty = true; });
     addProperty(_size);
 
     if (p.texture.has_value()) {
-        _texturePath = absPath(p.texture->string());
-        _textureFile = std::make_unique<File>(_texturePath);
-        _texturePath.onChange([&]() { loadTexture(); });
+        _texturePath = absPath(p.texture->string()).string();
+        _textureFile = std::make_unique<File>(_texturePath.value());
+        _texturePath.onChange([this]() { loadTexture(); });
         addProperty(_texturePath);
-        _textureFile->setCallback([&](const File&) { _textureIsDirty = true; });
+        _textureFile->setCallback([this]() { _textureIsDirty = true; });
     }
 
     if (p.textureFwrd.has_value()) {
-        _textureFwrdPath = absPath(p.textureFwrd->string());
-        _textureFileForwards = std::make_unique<File>(_textureFwrdPath);
-        _textureFwrdPath.onChange([&]() { loadTexture(); });
+        _textureFwrdPath = absPath(p.textureFwrd->string()).string();
+        _textureFileForwards = std::make_unique<File>(_textureFwrdPath.value());
+        _textureFwrdPath.onChange([this]() { loadTexture(); });
         addProperty(_textureFwrdPath);
-        _textureFileForwards->setCallback([&](const File&) { _textureIsDirty = true; });
+        _textureFileForwards->setCallback([this]() { _textureIsDirty = true; });
     }
 
     if (p.textureBckwrd.has_value()) {
-        _textureBckwrdPath = absPath(p.textureBckwrd->string());
-        _textureFileBackwards = std::make_unique<File>(_textureBckwrdPath);
-        _textureBckwrdPath.onChange([&]() { loadTexture(); });
+        _textureBckwrdPath = absPath(p.textureBckwrd->string()).string();
+        _textureFileBackwards = std::make_unique<File>(_textureBckwrdPath.value());
+        _textureBckwrdPath.onChange([this]() { loadTexture(); });
         addProperty(_textureBckwrdPath);
-        _textureFileBackwards->setCallback([&](const File&) { _textureIsDirty = true; });
+        _textureFileBackwards->setCallback([this]() { _textureIsDirty = true; });
     }
 
     if (p.textureUnlit.has_value()) {
-        _textureUnlitPath = absPath(p.textureUnlit->string());
-        _textureFileUnlit = std::make_unique<File>(_textureUnlitPath);
-        _textureUnlitPath.onChange([&]() { loadTexture(); });
+        _textureUnlitPath = absPath(p.textureUnlit->string()).string();
+        _textureFileUnlit = std::make_unique<File>(_textureUnlitPath.value());
+        _textureUnlitPath.onChange([this]() { loadTexture(); });
         addProperty(_textureUnlitPath);
-        _textureFileUnlit->setCallback([&](const File&) { _textureIsDirty = true; });
+        _textureFileUnlit->setCallback([this]() { _textureIsDirty = true; });
     }
 
     if (p.textureColor.has_value()) {
-        _textureColorPath = absPath(p.textureColor->string());
-        _textureFileColor = std::make_unique<File>(_textureColorPath);
-        _textureColorPath.onChange([&]() { loadTexture(); });
+        _textureColorPath = absPath(p.textureColor->string()).string();
+        _textureFileColor = std::make_unique<File>(_textureColorPath.value());
+        _textureColorPath.onChange([this]() { loadTexture(); });
         addProperty(_textureColorPath);
-        _textureFileColor->setCallback([&](const File&) { _textureIsDirty = true; });
+        _textureFileColor->setCallback([this]() { _textureIsDirty = true; });
     }
 
     if (p.textureTransparency.has_value()) {
-        _textureTransparencyPath = absPath(p.textureTransparency->string());
-        _textureFileTransparency = std::make_unique<File>(_textureTransparencyPath);
-        _textureTransparencyPath.onChange([&]() { loadTexture(); });
+        _textureTransparencyPath = absPath(p.textureTransparency->string()).string();
+        _textureFileTransparency = std::make_unique<File>(
+            _textureTransparencyPath.value()
+        );
+        _textureTransparencyPath.onChange([this]() { loadTexture(); });
         addProperty(_textureTransparencyPath);
-        _textureFileTransparency->setCallback([&](const File&) { _textureIsDirty = true; });
+        _textureFileTransparency->setCallback([this]() { _textureIsDirty = true; });
     }
 
     _offset = p.offset.value_or(_offset);
+    _offset.setViewOption(properties::Property::ViewOptions::MinMaxRange);
     addProperty(_offset);
 
     _nightFactor = p.nightFactor.value_or(_nightFactor);
@@ -380,14 +381,13 @@ void RingsComponent::deinitializeGL() {
     _geometryOnlyShader = nullptr;
 }
 
-void RingsComponent::draw(const RenderData& data,
-                          const RingsComponent::RenderPass renderPass,
+void RingsComponent::draw(const RenderData& data, RenderPass renderPass,
                           const ShadowComponent::ShadowMapData& shadowData)
 {
-    if (renderPass == GeometryAndShading) {
+    if (renderPass == RenderPass::GeometryAndShading) {
         _shader->activate();
     }
-    else if (renderPass == GeometryOnly) {
+    else if (renderPass == RenderPass::GeometryOnly) {
         _geometryOnlyShader->activate();
     }
 
@@ -406,7 +406,7 @@ void RingsComponent::draw(const RenderData& data,
     ghoul::opengl::TextureUnit ringTextureUnlitUnit;
     ghoul::opengl::TextureUnit ringTextureColorUnit;
     ghoul::opengl::TextureUnit ringTextureTransparencyUnit;
-    if (renderPass == GeometryAndShading) {
+    if (renderPass == RenderPass::GeometryAndShading) {
         if (_isAdvancedTextureEnabled) {
             _shader->setUniform(
                 _uniformCacheAdvancedRings.modelViewProjectionMatrix,
@@ -540,7 +540,7 @@ void RingsComponent::draw(const RenderData& data,
         glEnablei(GL_BLEND, 0);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
-    else if (renderPass == GeometryOnly) {
+    else if (renderPass == RenderPass::GeometryOnly) {
         _geometryOnlyShader->setUniform(
             _geomUniformCache.modelViewProjectionMatrix,
             modelViewProjectionTransform
@@ -566,12 +566,11 @@ void RingsComponent::draw(const RenderData& data,
 
     glEnable(GL_CULL_FACE);
 
-    if (renderPass == GeometryAndShading) {
+    if (renderPass == RenderPass::GeometryAndShading) {
         _shader->deactivate();
         global::renderEngine->openglStateCache().resetBlendState();
-        //global::renderEngine->openglStateCache().resetDepthState();
     }
-    else if (renderPass == GeometryOnly) {
+    else if (renderPass == RenderPass::GeometryOnly) {
         _geometryOnlyShader->deactivate();
     }
 }
@@ -615,7 +614,7 @@ void RingsComponent::loadTexture() {
     if (!_texturePath.value().empty()) {
 
         std::unique_ptr<Texture> texture = TextureReader::ref().loadTexture(
-            absPath(_texturePath)
+            absPath(_texturePath).string()
         );
 
         if (texture) {
@@ -628,16 +627,16 @@ void RingsComponent::loadTexture() {
             _texture->uploadTexture();
             _texture->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
 
-            _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath);
-            _textureFile->setCallback(
-                [&](const ghoul::filesystem::File&) { _textureIsDirty = true; }
+            _textureFile = std::make_unique<ghoul::filesystem::File>(
+                _texturePath.value()
             );
+            _textureFile->setCallback([this]() { _textureIsDirty = true; });
         }
     }
 
     if (!_textureFwrdPath.value().empty()) {
         std::unique_ptr<Texture> textureForwards = TextureReader::ref().loadTexture(
-            absPath(_textureFwrdPath)
+            absPath(_textureFwrdPath).string()
         );
 
         if (textureForwards) {
@@ -655,17 +654,15 @@ void RingsComponent::loadTexture() {
                 ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
 
             _textureFileForwards = std::make_unique<ghoul::filesystem::File>(
-                _textureFwrdPath
-                );
-            _textureFileForwards->setCallback(
-                [&](const ghoul::filesystem::File&) { _textureIsDirty = true; }
+                _textureFwrdPath.value()
             );
+            _textureFileForwards->setCallback([this]() { _textureIsDirty = true; });
         }
     }
 
     if (!_textureBckwrdPath.value().empty()) {
         std::unique_ptr<Texture> textureBackwards = TextureReader::ref().loadTexture(
-            absPath(_textureBckwrdPath)
+            absPath(_textureBckwrdPath).string()
         );
 
         if (textureBackwards) {
@@ -683,17 +680,15 @@ void RingsComponent::loadTexture() {
                 ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
 
             _textureFileBackwards = std::make_unique<ghoul::filesystem::File>(
-                _textureBckwrdPath
-                );
-            _textureFileBackwards->setCallback(
-                [&](const ghoul::filesystem::File&) { _textureIsDirty = true; }
+                _textureBckwrdPath.value()
             );
+            _textureFileBackwards->setCallback([this]() { _textureIsDirty = true; });
         }
     }
 
     if (!_textureUnlitPath.value().empty()) {
         std::unique_ptr<Texture> textureUnlit = TextureReader::ref().loadTexture(
-            absPath(_textureUnlitPath)
+            absPath(_textureUnlitPath).string()
         );
 
         if (textureUnlit) {
@@ -707,18 +702,18 @@ void RingsComponent::loadTexture() {
             _textureUnlit = std::move(textureUnlit);
 
             _textureUnlit->uploadTexture();
-            _textureUnlit->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
+            _textureUnlit->setFilter(Texture::FilterMode::AnisotropicMipMap);
 
-            _textureFileUnlit = std::make_unique<ghoul::filesystem::File>(_textureUnlitPath);
-            _textureFileUnlit->setCallback(
-                [&](const ghoul::filesystem::File&) { _textureIsDirty = true; }
+            _textureFileUnlit = std::make_unique<ghoul::filesystem::File>(
+                _textureUnlitPath.value()
             );
+            _textureFileUnlit->setCallback([this]() { _textureIsDirty = true; });
         }
     }
 
     if (!_textureColorPath.value().empty()) {
         std::unique_ptr<Texture> textureColor = TextureReader::ref().loadTexture(
-            absPath(_textureColorPath)
+            absPath(_textureColorPath).string()
         );
 
         if (textureColor) {
@@ -732,18 +727,18 @@ void RingsComponent::loadTexture() {
             _textureColor = std::move(textureColor);
 
             _textureColor->uploadTexture();
-            _textureColor->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
+            _textureColor->setFilter(Texture::FilterMode::AnisotropicMipMap);
 
-            _textureFileColor = std::make_unique<ghoul::filesystem::File>(_textureColorPath);
-            _textureFileColor->setCallback(
-                [&](const ghoul::filesystem::File&) { _textureIsDirty = true; }
+            _textureFileColor = std::make_unique<ghoul::filesystem::File>(
+                _textureColorPath.value()
             );
+            _textureFileColor->setCallback([this]() { _textureIsDirty = true; });
         }
     }
 
     if (!_textureTransparencyPath.value().empty()) {
         std::unique_ptr<Texture> textureTransparency = TextureReader::ref().loadTexture(
-            absPath(_textureTransparencyPath)
+            absPath(_textureTransparencyPath).string()
         );
 
         if (textureTransparency) {
@@ -762,11 +757,9 @@ void RingsComponent::loadTexture() {
             );
 
             _textureFileTransparency = std::make_unique<ghoul::filesystem::File>(
-                _textureTransparencyPath
-            );
-            _textureFileTransparency->setCallback(
-                [&](const ghoul::filesystem::File&) { _textureIsDirty = true; }
+                _textureTransparencyPath.value()
             );
+            _textureFileTransparency->setCallback([this]() { _textureIsDirty = true; });
         }
     }
 
diff --git a/modules/globebrowsing/src/ringscomponent.h b/modules/globebrowsing/src/ringscomponent.h
index c19a8565b9..6c9acc4fd3 100644
--- a/modules/globebrowsing/src/ringscomponent.h
+++ b/modules/globebrowsing/src/ringscomponent.h
@@ -50,7 +50,7 @@ namespace documentation { struct Documentation; }
 
 class RingsComponent : public properties::PropertyOwner {
 public:
-    enum RenderPass {
+    enum class RenderPass {
         GeometryOnly,
         GeometryAndShading
     };
@@ -63,7 +63,7 @@ public:
 
     bool isReady() const;
 
-    void draw(const RenderData& data, const RingsComponent::RenderPass renderPass,
+    void draw(const RenderData& data, RenderPass renderPass,
         const ShadowComponent::ShadowMapData& shadowData = {}
     );
     void update(const UpdateData& data);
diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp
index 55a5285480..f7c63a8df0 100644
--- a/modules/globebrowsing/src/shadowcomponent.cpp
+++ b/modules/globebrowsing/src/shadowcomponent.cpp
@@ -155,9 +155,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation ShadowComponent::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "globebrowsing_shadows_component";
-    return doc;
+    return codegen::doc<Parameters>("globebrowsing_shadows_component");
 }
 
 ShadowComponent::ShadowComponent(const ghoul::Dictionary& dictionary)
@@ -356,33 +354,6 @@ void ShadowComponent::end() {
     if (_blendIsEnabled) {
         glEnable(GL_BLEND);
     }
-
-    if (_viewDepthMap) {
-        if (!_renderDMProgram) {
-            _renderDMProgram = global::renderEngine->buildRenderProgram(
-                "ShadowMappingDebuggingProgram",
-                absPath("${MODULE_GLOBEBROWSING}/shaders/smviewer_vs.glsl"),
-                absPath("${MODULE_GLOBEBROWSING}/shaders/smviewer_fs.glsl")
-            );
-        }
-
-        if (!_quadVAO) {
-            glGenVertexArrays(1, &_quadVAO);
-        }
-
-        _renderDMProgram->activate();
-
-        ghoul::opengl::TextureUnit shadowMapUnit;
-        shadowMapUnit.activate();
-        glBindTexture(GL_TEXTURE_2D, _shadowDepthTexture);
-
-        _renderDMProgram->setUniform("shadowMapTexture", shadowMapUnit);
-
-        glBindVertexArray(_quadVAO);
-        glDrawArrays(GL_TRIANGLES, 0, 6);
-
-        _renderDMProgram->deactivate();
-    }
 }
 
 void ShadowComponent::update(const UpdateData&) {
@@ -619,10 +590,6 @@ ShadowComponent::ShadowMapData ShadowComponent::shadowMapData() const {
     return _shadowData;
 }
 
-void ShadowComponent::setViewDepthMap(bool enable) {
-    _viewDepthMap = enable;
-}
-
 GLuint ShadowComponent::dDepthTexture() const {
     return _dDepthTexture;
 }
diff --git a/modules/globebrowsing/src/shadowcomponent.h b/modules/globebrowsing/src/shadowcomponent.h
index dddea2fb66..b39c832b2a 100644
--- a/modules/globebrowsing/src/shadowcomponent.h
+++ b/modules/globebrowsing/src/shadowcomponent.h
@@ -77,8 +77,6 @@ public:
 
     ShadowComponent::ShadowMapData shadowMapData() const;
 
-    void setViewDepthMap(bool enable);
-
     GLuint dDepthTexture() const;
 
 private:
@@ -137,9 +135,6 @@ private:
 
     // DEBUG
     bool _executeDepthTextureSave = false;
-    bool _viewDepthMap = false;
-    std::unique_ptr<ghoul::opengl::ProgramObject> _renderDMProgram;
-    GLuint _quadVAO = 0u;
 };
 
 } // namespace openspace
diff --git a/modules/globebrowsing/src/tileprovider.cpp b/modules/globebrowsing/src/tileprovider.cpp
index ddf1200ed9..53d75717f3 100644
--- a/modules/globebrowsing/src/tileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider.cpp
@@ -44,6 +44,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/opengl/openglstatecache.h>
+#include <filesystem>
 #include <fstream>
 #include "cpl_minixml.h"
 
@@ -148,6 +149,21 @@ namespace temporal {
         "This is the path to the XML configuration file that describes the temporal tile "
         "information."
     };
+
+    constexpr openspace::properties::Property::PropertyInfo UseFixedTimeInfo = {
+        "UseFixedTime",
+        "Use Fixed Time",
+        "If this value is enabled, the time-varying timevarying dataset will always use "
+        "the time that is specified in the 'FixedTime' property, rather than using the "
+        "actual time from OpenSpace"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo FixedTimeInfo = {
+        "FixedTime",
+        "Fixed Time",
+        "If the 'UseFixedTime' is enabled, this time will be used instead of the actual "
+        "time taken from OpenSpace for the displayed tiles."
+    };
 } // namespace temporal
 
 
@@ -344,12 +360,11 @@ std::unique_ptr<TileProvider> initTileProvider(TemporalTileProvider& t,
     const size_t numChars = strlen(temporal::UrlTimePlaceholder);
     // @FRAGILE:  This will only find the first instance. Dangerous if that instance is
     // commented out ---abock
-    const std::string timeSpecifiedXml = xmlTemplate.replace(pos, numChars, timekey);
-    std::string gdalDatasetXml = timeSpecifiedXml;
+    std::string xml = xmlTemplate.replace(pos, numChars, timekey);
 
-    FileSys.expandPathTokens(gdalDatasetXml, IgnoredTokens);
+    xml = FileSys.expandPathTokens(std::move(xml), IgnoredTokens).string();
 
-    t.initDict.setValue(KeyFilePath, gdalDatasetXml);
+    t.initDict.setValue(KeyFilePath, xml);
     return std::make_unique<DefaultTileProvider>(t.initDict);
 }
 
@@ -375,18 +390,29 @@ TileProvider* getTileProvider(TemporalTileProvider& t, std::string_view timekey)
 TileProvider* getTileProvider(TemporalTileProvider& t, const Time& time) {
     ZoneScoped
 
-    Time tCopy(time);
-    if (t.timeQuantizer.quantize(tCopy, true)) {
-        char Buffer[22];
-        const int size = timeStringify(t.timeFormat, tCopy, Buffer);
+    if (t.useFixedTime && !t.fixedTime.value().empty()) {
         try {
-            return getTileProvider(t, std::string_view(Buffer, size));
+            return getTileProvider(t, t.fixedTime.value());
         }
         catch (const ghoul::RuntimeError& e) {
             LERRORC("TemporalTileProvider", e.message);
             return nullptr;
         }
     }
+    else {
+        Time tCopy(time);
+        if (t.timeQuantizer.quantize(tCopy, true)) {
+            char Buffer[22];
+            const int size = timeStringify(t.timeFormat, tCopy, Buffer);
+            try {
+                return getTileProvider(t, std::string_view(Buffer, size));
+            }
+            catch (const ghoul::RuntimeError& e) {
+                LERRORC("TemporalTileProvider", e.message);
+                return nullptr;
+            }
+        }
+    }
     return nullptr;
 }
 
@@ -487,9 +513,9 @@ bool readFilePath(TemporalTileProvider& t) {
     }
 
     // File path was not a path to a file but a GDAL config or empty
-    ghoul::filesystem::File f(t.filePath);
-    if (FileSys.fileExists(f)) {
-        t.initDict.setValue(temporal::KeyBasePath, f.directoryName());
+    std::filesystem::path f(t.filePath.value());
+    if (std::filesystem::is_regular_file(f)) {
+        t.initDict.setValue(temporal::KeyBasePath, f.parent_path().string());
     }
 
     t.gdalXmlTemplate = consumeTemporalMetaData(t, xml);
@@ -831,6 +857,8 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
 TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
     : initDict(dictionary)
     , filePath(temporal::FilePathInfo)
+    , useFixedTime(temporal::UseFixedTimeInfo, false)
+    , fixedTime(temporal::FixedTimeInfo)
 {
     ZoneScoped
 
@@ -839,6 +867,16 @@ TemporalTileProvider::TemporalTileProvider(const ghoul::Dictionary& dictionary)
     filePath = dictionary.value<std::string>(KeyFilePath);
     addProperty(filePath);
 
+    if (dictionary.hasValue<bool>(temporal::UseFixedTimeInfo.identifier)) {
+        useFixedTime = dictionary.value<bool>(temporal::UseFixedTimeInfo.identifier);
+    }
+    addProperty(useFixedTime);
+    
+    if (dictionary.hasValue<std::string>(temporal::FixedTimeInfo.identifier)) {
+        fixedTime = dictionary.value<std::string>(temporal::FixedTimeInfo.identifier);
+    }
+    addProperty(fixedTime);
+
     successfulInitialization = readFilePath(*this);
 
     if (!successfulInitialization) {
diff --git a/modules/globebrowsing/src/tileprovider.h b/modules/globebrowsing/src/tileprovider.h
index 2d70e8dd0c..0641739388 100644
--- a/modules/globebrowsing/src/tileprovider.h
+++ b/modules/globebrowsing/src/tileprovider.h
@@ -34,6 +34,7 @@
 #include <modules/globebrowsing/src/tiletextureinitdata.h>
 #include <modules/globebrowsing/src/timequantizer.h>
 #include <openspace/properties/stringproperty.h>
+#include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <unordered_map>
 
@@ -174,6 +175,8 @@ struct TemporalTileProvider : public TileProvider {
 
     ghoul::Dictionary initDict;
     properties::StringProperty filePath;
+    properties::BoolProperty useFixedTime;
+    properties::StringProperty fixedTime;
     std::string gdalXmlTemplate;
 
     std::unordered_map<TimeKey, std::unique_ptr<TileProvider>> tileProviderMap;
diff --git a/modules/globebrowsing/src/tiletextureinitdata.cpp b/modules/globebrowsing/src/tiletextureinitdata.cpp
index b47d838548..04137f7d6f 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.cpp
+++ b/modules/globebrowsing/src/tiletextureinitdata.cpp
@@ -192,7 +192,7 @@ TileTextureInitData TileTextureInitData::operator=(const TileTextureInitData& rh
     return rhs;
 }
 
-TileTextureInitData TileTextureInitData::operator=(TileTextureInitData&& rhs) {
+TileTextureInitData TileTextureInitData::operator=(TileTextureInitData&& rhs) noexcept {
     if (this == &rhs) {
         return *this;
     }
diff --git a/modules/globebrowsing/src/tiletextureinitdata.h b/modules/globebrowsing/src/tiletextureinitdata.h
index 2a311a81f5..46d0ea0215 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.h
+++ b/modules/globebrowsing/src/tiletextureinitdata.h
@@ -49,7 +49,7 @@ public:
     TileTextureInitData(TileTextureInitData&& original) = default;
 
     TileTextureInitData operator=(const TileTextureInitData& rhs);
-    TileTextureInitData operator=(TileTextureInitData&& rhs);
+    TileTextureInitData operator=(TileTextureInitData&& rhs) noexcept;
 
     ~TileTextureInitData() = default;
 
diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp
index a931db8a23..5317be039e 100644
--- a/modules/globebrowsing/src/timequantizer.cpp
+++ b/modules/globebrowsing/src/timequantizer.cpp
@@ -335,8 +335,8 @@ TimeQuantizer::TimeQuantizer(std::string start, std::string end,
     : _start(start)
     , _timerange(std::move(start), std::move(end))
 {
-    verifyStartTimeRestrictions();
     _resolution = parseTimeResolutionStr(resolution);
+    verifyStartTimeRestrictions();
 }
 
 double TimeQuantizer::parseTimeResolutionStr(const std::string& resolutionStr) {
@@ -366,18 +366,36 @@ void TimeQuantizer::setStartEndRange(const std::string& start, const std::string
 
 void TimeQuantizer::setResolution(const std::string& resolutionString) {
     _resolution = parseTimeResolutionStr(resolutionString);
+    verifyStartTimeRestrictions();
 }
 
 void TimeQuantizer::verifyStartTimeRestrictions() {
-    if (_start.day() < 1 || _start.day() > 28) {
+    //If monthly time resolution then restrict to 28 days so every month is consistent
+    unsigned int dayUpperLimit;
+    std::string helpfulDescription = "the selected month";
+    if (_resolutionUnit == 'M') {
+        dayUpperLimit = 28;
+        helpfulDescription = "monthly increment";
+    }
+    else if (_resolutionUnit == 'y') {
+        //Get month sizes using a fixed non-leap year
+        dayUpperLimit = monthSize(_start.month(), 2001);
+        helpfulDescription += " on a yearly increment";
+    }
+    else {
+        dayUpperLimit = 31;
+    }
+    if (_start.day() < 1 || _start.day() > dayUpperLimit) {
         throw ghoul::RuntimeError(fmt::format(
-            "Invalid start day value of {} for day of month. Valid days are 1 - 28",
-            _start.day()
+            "Invalid start day value of {} for {}, valid days are 1 - {}",
+            _start.day(),
+            helpfulDescription,
+            dayUpperLimit
         ));
     }
     if (_start.hour() != 0 || _start.minute() != 0 || _start.second() != 0) {
         throw ghoul::RuntimeError(fmt::format(
-            "Invalid start time value of {}:{}:{}. Time must be 00:00:00",
+            "Invalid start time value of {}:{}:{}, time must be 00:00:00",
             _start.hour(), _start.minute(), _start.second()
         ));
     }
diff --git a/modules/imgui/shaders/gui_fs.glsl b/modules/imgui/shaders/gui_fs.glsl
index 55266b7681..159603cd92 100644
--- a/modules/imgui/shaders/gui_fs.glsl
+++ b/modules/imgui/shaders/gui_fs.glsl
@@ -32,5 +32,5 @@ in vec4 out_color;
 out vec4 FragColor;
 
 void main() {
-    FragColor = out_color * texture(tex, out_uv);
+  FragColor = out_color * texture(tex, out_uv);
 }
diff --git a/modules/imgui/shaders/gui_vs.glsl b/modules/imgui/shaders/gui_vs.glsl
index aed40bd172..ae30863e23 100644
--- a/modules/imgui/shaders/gui_vs.glsl
+++ b/modules/imgui/shaders/gui_vs.glsl
@@ -34,7 +34,7 @@ out vec4 out_color;
 uniform mat4 ortho;
 
 void main() {
-    out_uv = in_uv;
-    out_color = in_color;
-    gl_Position = ortho * vec4(in_position.xy, 0.0, 1.0);
+  out_uv = in_uv;
+  out_color = in_color;
+  gl_Position = ortho * vec4(in_position.xy, 0.0, 1.0);
 }
diff --git a/modules/imgui/src/gui.cpp b/modules/imgui/src/gui.cpp
index b86622ba16..1329d52063 100644
--- a/modules/imgui/src/gui.cpp
+++ b/modules/imgui/src/gui.cpp
@@ -38,7 +38,7 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
-
+#include <filesystem>
 
 namespace {
     constexpr const char* _loggerCat = "GUI";
@@ -53,7 +53,7 @@ namespace {
     constexpr const std::array<const char*, 2> UniformNames = { "tex", "ortho" };
 
     void addScreenSpaceRenderableLocal(std::string identifier, std::string texturePath) {
-        if (!FileSys.fileExists(absPath(texturePath))) {
+        if (!std::filesystem::is_regular_file(absPath(texturePath))) {
             LWARNING(fmt::format("Could not find image '{}'", texturePath));
             return;
         }
@@ -206,8 +206,7 @@ void GUI::deinitialize() {
 void GUI::initializeGL() {
     std::string cachedFile = FileSys.cacheManager()->cachedFilename(
         configurationFile,
-        "",
-        ghoul::filesystem::CacheManager::Persistent::Yes
+        ""
     );
 
     LDEBUG(fmt::format("Using {} as ImGUI cache location", cachedFile));
@@ -248,9 +247,9 @@ void GUI::initializeGL() {
         io.KeyMap[ImGuiKey_Y] = static_cast<int>(Key::Y);
         io.KeyMap[ImGuiKey_Z] = static_cast<int>(Key::Z);
 
-        io.Fonts->AddFontFromFileTTF(absPath(GuiFont).c_str(), FontSize);
+        io.Fonts->AddFontFromFileTTF(absPath(GuiFont).string().c_str(), FontSize);
         captionFont = io.Fonts->AddFontFromFileTTF(
-            absPath(GuiFont).c_str(),
+            absPath(GuiFont).string().c_str(),
             FontSize * 1.5f
         );
 
diff --git a/modules/imgui/src/guiassetcomponent.cpp b/modules/imgui/src/guiassetcomponent.cpp
index 92b6eedaa5..d0eedb873f 100644
--- a/modules/imgui/src/guiassetcomponent.cpp
+++ b/modules/imgui/src/guiassetcomponent.cpp
@@ -30,9 +30,9 @@
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/scene/assetmanager.h>
 #include <openspace/scene/asset.h>
-
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/filesystem/file.h>
+#include <filesystem>
 
 namespace {
     std::string assetStateToString(openspace::Asset::State state) {
@@ -90,10 +90,10 @@ void GuiAssetComponent::renderTree(const Asset& asset, const std::string& relati
     using namespace ghoul::filesystem;
 
     std::string assetPath = asset.assetFilePath();
-    const std::string& assetDirectory = File(assetPath).directoryName();
+    std::string assetDirectory = std::filesystem::path(assetPath).parent_path().string();
 
     if (!relativeToPath.empty()) {
-        assetPath = FileSys.relativePath(assetPath, relativeToPath);
+        assetPath = std::filesystem::relative(assetPath, relativeToPath).string();
     }
 
     std::string assetText = assetPath + " " + assetStateToString(asset.state());
diff --git a/modules/imgui/src/guifilepathcomponent.cpp b/modules/imgui/src/guifilepathcomponent.cpp
index bfee3703ad..d6f0d97f7e 100644
--- a/modules/imgui/src/guifilepathcomponent.cpp
+++ b/modules/imgui/src/guifilepathcomponent.cpp
@@ -51,7 +51,7 @@ void GuiFilePathComponent::render() {
     for (const std::string& t : tokens) {
         ImGui::Text("%s", t.c_str());
         ImGui::NextColumn();
-        ImGui::Text("%s", absPath(t).c_str());
+        ImGui::Text("%s", absPath(t).string().c_str());
         ImGui::NextColumn();
         ImGui::Separator();
     }
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index 6462e330f4..71f566af29 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -390,7 +390,7 @@ void renderDoubleProperty(properties::Property* prop, const std::string& ownerNa
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
@@ -545,7 +545,7 @@ void renderFloatProperty(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
@@ -577,7 +577,7 @@ void renderVec2Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
@@ -621,7 +621,7 @@ void renderVec3Property(Property* prop, const std::string& ownerName,
             min,
             max,
             "%.5f",
-            p->exponent()
+            ImGuiSliderFlags_Logarithmic
         );
     }
     if (showTooltip) {
@@ -666,7 +666,7 @@ void renderVec4Property(Property* prop, const std::string& ownerName,
             min,
             max,
             "%.5f",
-            p->exponent()
+            ImGuiSliderFlags_Logarithmic
         );
     }
     if (showTooltip) {
@@ -702,7 +702,7 @@ void renderDVec2Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
@@ -738,7 +738,7 @@ void renderDVec3Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
@@ -774,7 +774,7 @@ void renderDVec4Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     if (showTooltip) {
         renderTooltip(prop, tooltipDelay);
@@ -822,7 +822,7 @@ void renderDMat2Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     changed |= ImGui::SliderFloat2(
         "[1]",
@@ -830,7 +830,7 @@ void renderDMat2Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
 
     if (showTooltip) {
@@ -881,7 +881,7 @@ void renderDMat3Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     changed |= ImGui::SliderFloat3(
         "[1]",
@@ -889,7 +889,7 @@ void renderDMat3Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     changed |= ImGui::SliderFloat3(
         "[2]",
@@ -897,7 +897,7 @@ void renderDMat3Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
 
     if (showTooltip) {
@@ -950,7 +950,7 @@ void renderDMat4Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     changed |= ImGui::SliderFloat4(
         "[1]",
@@ -958,7 +958,7 @@ void renderDMat4Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     changed |= ImGui::SliderFloat4(
         "[2]",
@@ -966,7 +966,7 @@ void renderDMat4Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
     changed |= ImGui::SliderFloat4(
         "[3]",
@@ -974,7 +974,7 @@ void renderDMat4Property(Property* prop, const std::string& ownerName,
         min,
         max,
         "%.5f",
-        p->exponent()
+        ImGuiSliderFlags_Logarithmic
     );
 
     if (showTooltip) {
diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp
index 440be61f3c..6d8e217807 100644
--- a/modules/iswa/rendering/datacygnet.cpp
+++ b/modules/iswa/rendering/datacygnet.cpp
@@ -276,7 +276,7 @@ void DataCygnet::readTransferFunctions(std::string tfPath) {
     if (tfFile.is_open()) {
         std::string line;
         while (getline(tfFile, line)) {
-            tfs.emplace_back(absPath(line));
+            tfs.emplace_back(absPath(line).string());
         }
 
         tfFile.close();
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index 78d718fa5b..82fe6a0145 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -131,7 +131,7 @@ void KameleonPlane::initializeGL() {
     initializeTime();
     createGeometry();
 
-    readFieldlinePaths(absPath(_fieldlineIndexFile));
+    readFieldlinePaths(absPath(_fieldlineIndexFile).string());
 
     if (_group) {
         _dataProcessor = _group->dataProcessor();
diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp
index 7c0a1b4e1c..37ee4c1381 100644
--- a/modules/iswa/util/dataprocessorkameleon.cpp
+++ b/modules/iswa/util/dataprocessorkameleon.cpp
@@ -31,6 +31,7 @@
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <algorithm>
+#include <filesystem>
 
 namespace openspace {
 
@@ -158,14 +159,14 @@ void DataProcessorKameleon::setDimensions(glm::size3_t dimensions) {
 }
 
 void DataProcessorKameleon::initializeKameleonWrapper(std::string path) {
-    const std::string& extension = ghoul::filesystem::File(absPath(path)).fileExtension();
-    if (FileSys.fileExists(absPath(path)) && extension == "cdf") {
+    std::filesystem::path extension = std::filesystem::path(absPath(path)).extension();
+    if (std::filesystem::is_regular_file(absPath(path)) && extension == ".cdf") {
         if (_kw) {
             _kw->close();
         }
 
         _kwPath = std::move(path);
-        _kw = std::make_shared<KameleonWrapper>(absPath(_kwPath));
+        _kw = std::make_shared<KameleonWrapper>(absPath(_kwPath).string());
     }
 }
 
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index ff0655fdbc..8d1fccebf1 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -42,6 +42,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/constexpr.h>
+#include <filesystem>
 #include <fstream>
 
 #include "iswamanager_lua.inl"
@@ -410,10 +411,9 @@ std::string IswaManager::parseKWToLuaTable(const CdfInfo& info, const std::strin
         return "";
     }
 
-    const std::string& extension =
-        ghoul::filesystem::File(absPath(info.path)).fileExtension();
-    if (extension == "cdf") {
-        KameleonWrapper kw = KameleonWrapper(absPath(info.path));
+    std::filesystem::path ext = std::filesystem::path(absPath(info.path)).extension();
+    if (ext == ".cdf") {
+        KameleonWrapper kw = KameleonWrapper(absPath(info.path).string());
 
         std::string parent = kw.parent();
         std::string frame = kw.frame();
@@ -587,10 +587,8 @@ void IswaManager::createSphere(MetadataFuture& data) {
 }
 
 void IswaManager::createKameleonPlane(CdfInfo info, std::string cut) {
-    const std::string& extension = ghoul::filesystem::File(
-        absPath(info.path)
-    ).fileExtension();
-    if (FileSys.fileExists(absPath(info.path)) && extension == "cdf") {
+    std::filesystem::path ext = std::filesystem::path(absPath(info.path)).extension();
+    if (std::filesystem::is_regular_file(absPath(info.path)) && ext == ".cdf") {
         if (!info.group.empty()) {
             std::string type = typeid(KameleonPlane).name();
             registerGroup(info.group, type);
@@ -621,16 +619,17 @@ void IswaManager::createKameleonPlane(CdfInfo info, std::string cut) {
         }
     }
     else {
-        LWARNING( absPath(info.path) + " is not a cdf file or can't be found.");
+        LWARNING(
+            fmt::format("{} is not a cdf file or can't be found", absPath(info.path))
+        );
     }
 }
 
 void IswaManager::createFieldline(std::string name, std::string cdfPath,
                                   std::string seedPath)
 {
-    const std::string& ext = ghoul::filesystem::File(absPath(cdfPath)).fileExtension();
-
-    if (FileSys.fileExists(absPath(cdfPath)) && ext == "cdf") {
+    std::filesystem::path ext = std::filesystem::path(absPath(cdfPath)).extension();
+    if (std::filesystem::is_regular_file(absPath(cdfPath)) && ext == ".cdf") {
         std::string luaTable = "{"
             "Name = '" + name + "',"
             "Parent = 'Earth',"
@@ -700,10 +699,10 @@ ghoul::Event<>& IswaManager::iswaEvent() {
 }
 
 void IswaManager::addCdfFiles(std::string cdfpath) {
-    cdfpath = absPath(cdfpath);
-    if (FileSys.fileExists(cdfpath)) {
+    std::filesystem::path cdf = absPath(cdfpath);
+    if (std::filesystem::is_regular_file(cdf)) {
         //std::string basePath = path.substr(0, path.find_last_of("/\\"));
-        std::ifstream jsonFile(cdfpath);
+        std::ifstream jsonFile(cdf);
 
         if (jsonFile.is_open()) {
             json cdfGroups = json::parse(jsonFile);
@@ -742,7 +741,7 @@ void IswaManager::addCdfFiles(std::string cdfpath) {
         }
     }
     else {
-        LWARNING(cdfpath + " is not a cdf file or can't be found.");
+        LWARNING(fmt::format("{} is not a cdf file or can't be found", cdf));
     }
 }
 
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index 5528881746..05927d31d8 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -31,6 +31,7 @@
 #include <ghoul/glm.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/misc.h>
+#include <filesystem>
 
 #ifdef WIN32
 #pragma warning (push)
@@ -113,7 +114,7 @@ KameleonWrapper::~KameleonWrapper() {
 bool KameleonWrapper::open(const std::string& filename) {
     close();
 
-    if (!FileSys.fileExists(filename)) {
+    if (!std::filesystem::is_regular_file(filename)) {
         return false;
     }
 
diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp
index 63301ba596..9d4cef1d7c 100644
--- a/modules/kameleonvolume/kameleonvolumereader.cpp
+++ b/modules/kameleonvolume/kameleonvolumereader.cpp
@@ -31,6 +31,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
+#include <filesystem>
 
 #ifdef WIN32
 #pragma warning (push)
@@ -75,7 +76,7 @@ namespace {
 namespace openspace::kameleonvolume {
 
 KameleonVolumeReader::KameleonVolumeReader(std::string path) : _path(std::move(path)) {
-    if (!FileSys.fileExists(_path)) {
+    if (!std::filesystem::is_regular_file(_path)) {
         throw ghoul::FileNotFoundError(_path);
     }
 
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index b12c28ac9f..2e8ad45922 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -45,6 +45,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/texture.h>
+#include <filesystem>
 
 namespace {
     constexpr const char* _loggerCat = "RenderableKameleonVolume";
@@ -172,7 +173,7 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
     }
 
     if (dictionary.hasValue<std::string>(KeySource)) {
-        _sourcePath = absPath(dictionary.value<std::string>(KeySource));
+        _sourcePath = absPath(dictionary.value<std::string>(KeySource)).string();
     }
 
     if (dictionary.hasValue<std::string>(KeyVariable)) {
@@ -323,7 +324,7 @@ bool RenderableKameleonVolume::isCachingEnabled() const {
 }
 
 void RenderableKameleonVolume::load() {
-    if (!FileSys.fileExists(ghoul::filesystem::File(_sourcePath))) {
+    if (!std::filesystem::is_regular_file(_sourcePath.value())) {
         LERROR(fmt::format("File '{}' does not exist", _sourcePath.value()));
         return;
     }
@@ -331,13 +332,11 @@ void RenderableKameleonVolume::load() {
         loadFromPath(_sourcePath);
         return;
     }
-    ghoul::filesystem::File sourceFile(_sourcePath);
     std::string cachePath = FileSys.cacheManager()->cachedFilename(
-        sourceFile.baseName(),
-        cacheSuffix(),
-        ghoul::filesystem::CacheManager::Persistent::Yes
+        std::filesystem::path(_sourcePath.value()).stem(),
+        cacheSuffix()
     );
-    if (FileSys.fileExists(cachePath)) {
+    if (std::filesystem::is_regular_file(cachePath)) {
         loadRaw(cachePath);
     }
     else {
@@ -352,15 +351,8 @@ std::string RenderableKameleonVolume::cacheSuffix() const {
 }
 
 void RenderableKameleonVolume::loadFromPath(const std::string& path) {
-    ghoul::filesystem::File file(path);
-    std::string extension = file.fileExtension();
-    std::transform(
-        extension.begin(),
-        extension.end(),
-        extension.begin(),
-        [](char v) { return static_cast<char>(tolower(v)); }
-    );
-    if (extension == "cdf") {
+    std::filesystem::path extension = std::filesystem::path(path).extension();
+    if (extension == ".cdf" || extension == ".CDF") {
         loadCdf(path);
     }
     else {
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
index 9e4cac12a5..2d862da6a7 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
@@ -29,30 +29,37 @@
 #include <openspace/documentation/verifier.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/dictionaryjsonformatter.h>
+#include <filesystem>
 #include <fstream>
 
 namespace {
-    constexpr const char* KeyInput = "Input";
-    constexpr const char* KeyOutput = "Output";
     constexpr const char* MainTemplateFilename = "${WEB}/kameleondocumentation/main.hbs";
     constexpr const char* HandlebarsFilename = "${WEB}/common/handlebars-v4.0.5.js";
     constexpr const char* JsFilename = "${WEB}/kameleondocumentation/script.js";
     constexpr const char* BootstrapFilename = "${WEB}/common/bootstrap.min.css";
     constexpr const char* CssFilename = "${WEB}/common/style.css";
+
+    struct [[codegen::Dictionary(KameleonDocumentationTask)]] Parameters {
+        // The CDF file to extract data from
+        std::filesystem::path input;
+
+        // The HTML file to write documentation to
+        std::string output [[codegen::annotation("A valid filepath")]];
+    };
+#include "kameleondocumentationtask_codegen.cpp"
 } // namespace
 
 namespace openspace::kameleonvolume {
 
+documentation::Documentation KameleonDocumentationTask::documentation() {
+    return codegen::doc<Parameters>("kameleon_documentation_task");
+}
+
 KameleonDocumentationTask::KameleonDocumentationTask(const ghoul::Dictionary& dictionary)
 {
-    openspace::documentation::testSpecificationAndThrow(
-        documentation(),
-        dictionary,
-        "KameleonDocumentationTask"
-    );
-
-    _inputPath = absPath(dictionary.value<std::string>(KeyInput));
-    _outputPath = absPath(dictionary.value<std::string>(KeyOutput));
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _inputPath = absPath(p.input.string());
+    _outputPath = absPath(p.output);
 }
 
 std::string KameleonDocumentationTask::description() {
@@ -63,14 +70,14 @@ std::string KameleonDocumentationTask::description() {
 }
 
 void KameleonDocumentationTask::perform(const Task::ProgressCallback & progressCallback) {
-    KameleonVolumeReader reader(_inputPath);
+    KameleonVolumeReader reader(_inputPath.string());
     ghoul::Dictionary kameleonDictionary = reader.readMetaData();
     progressCallback(0.33f);
 
     ghoul::Dictionary dictionary;
     dictionary.setValue("kameleon", std::move(kameleonDictionary));
     dictionary.setValue("version", std::string(OPENSPACE_VERSION_NUMBER));
-    dictionary.setValue("input", _inputPath);
+    dictionary.setValue("input", _inputPath.string());
 
     std::string json = ghoul::formatJson(dictionary);
     progressCallback(0.66f);
@@ -146,26 +153,4 @@ void KameleonDocumentationTask::perform(const Task::ProgressCallback & progressC
     progressCallback(1.0f);
 }
 
-documentation::Documentation KameleonDocumentationTask::documentation() {
-    using namespace documentation;
-    return {
-        "KameleonDocumentationTask",
-        "kameleon_documentation_task",
-        {
-            {
-                KeyInput,
-                new StringAnnotationVerifier("A file path to a cdf file"),
-                Optional::No,
-                "The cdf file to extract data from"
-            },
-            {
-                KeyOutput,
-                new StringAnnotationVerifier("A valid filepath"),
-                Optional::No,
-                "The html file to write documentation to"
-            }
-        }
-    };
-}
-
 } // namespace openspace::kameleonvolume
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.h b/modules/kameleonvolume/tasks/kameleondocumentationtask.h
index 566f28b8a5..b321511fac 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.h
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.h
@@ -27,6 +27,7 @@
 
 #include <openspace/util/task.h>
 
+#include <filesystem>
 #include <string>
 
 namespace openspace::kameleonvolume {
@@ -41,8 +42,8 @@ public:
     static documentation::Documentation documentation();
 
 private:
-    std::string _inputPath;
-    std::string _outputPath;
+    std::filesystem::path _inputPath;
+    std::filesystem::path _outputPath;
 };
 
 } // namespace openspace::kameleonvolume
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
index ecd1bcccf5..af8d22baa8 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
@@ -29,26 +29,32 @@
 #include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/dictionaryjsonformatter.h>
+#include <filesystem>
 #include <fstream>
 
 namespace {
-    constexpr const char* KeyInput = "Input";
-    constexpr const char* KeyOutput = "Output";
+    struct [[codegen::Dictionary(KameleonMetadataToJsonTask)]] Parameters {
+        // The CDF file to extract data from
+        std::filesystem::path input;
+
+        // The JSON file to export data into
+        std::string output [[codegen::annotation("A valid filepath")]];
+    };
+#include "kameleonmetadatatojsontask_codegen.cpp"
 } // namespace
 
 namespace openspace::kameleonvolume {
 
+documentation::Documentation KameleonMetadataToJsonTask::documentation() {
+    return codegen::doc<Parameters>("kameleon_metadata_to_json_task");
+}
+
 KameleonMetadataToJsonTask::KameleonMetadataToJsonTask(
                                                       const ghoul::Dictionary& dictionary)
 {
-    openspace::documentation::testSpecificationAndThrow(
-        documentation(),
-        dictionary,
-        "KameleonMetadataToJsonTask"
-    );
-
-    _inputPath = absPath(dictionary.value<std::string>(KeyInput));
-    _outputPath = absPath(dictionary.value<std::string>(KeyOutput));
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _inputPath = absPath(p.input.string());
+    _outputPath = absPath(p.output);
 }
 
 std::string KameleonMetadataToJsonTask::description() {
@@ -59,7 +65,7 @@ std::string KameleonMetadataToJsonTask::description() {
 }
 
 void KameleonMetadataToJsonTask::perform(const Task::ProgressCallback& progressCallback) {
-    KameleonVolumeReader reader(_inputPath);
+    KameleonVolumeReader reader(_inputPath.string());
     ghoul::Dictionary dictionary = reader.readMetaData();
     progressCallback(0.5f);
 
@@ -69,26 +75,4 @@ void KameleonMetadataToJsonTask::perform(const Task::ProgressCallback& progressC
     progressCallback(1.0f);
 }
 
-documentation::Documentation KameleonMetadataToJsonTask::documentation() {
-    using namespace documentation;
-    return {
-        "KameleonMetadataToJsonTask",
-        "kameleon_metadata_to_json_task",
-        {
-            {
-                KeyInput,
-                new StringAnnotationVerifier("A file path to a cdf file"),
-                Optional::No,
-                "The cdf file to extract data from"
-            },
-            {
-                KeyOutput,
-                new StringAnnotationVerifier("A valid filepath"),
-                Optional::No,
-                "The JSON file to export data into"
-            }
-        }
-    };
-}
-
 } // namespace openspace::kameleonvolume
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
index 2e392116ce..b70385e286 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
@@ -27,6 +27,7 @@
 
 #include <openspace/util/task.h>
 
+#include <filesystem>
 #include <string>
 
 namespace openspace::kameleonvolume {
@@ -41,8 +42,8 @@ public:
     static documentation::Documentation documentation();
 
 private:
-    std::string _inputPath;
-    std::string _outputPath;
+    std::filesystem::path _inputPath;
+    std::filesystem::path _outputPath;
 };
 
 } // namespace openspace::kameleonvolume
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
index fd9c342afe..76015be84c 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
@@ -31,13 +31,11 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/dictionaryluaformatter.h>
 #include <array>
+#include <filesystem>
+#include <optional>
 
 namespace {
-    constexpr const char* KeyInput = "Input";
-    constexpr const char* KeyRawVolumeOutput = "RawVolumeOutput";
-    constexpr const char* KeyDictionaryOutput = "DictionaryOutput";
     constexpr const char* KeyDimensions = "Dimensions";
-    constexpr const char* KeyVariable = "Variable";
     constexpr const char* KeyTime = "Time";
     constexpr const char* KeyLowerDomainBound = "LowerDomainBound";
     constexpr const char* KeyUpperDomainBound = "UpperDomainBound";
@@ -46,92 +44,62 @@ namespace {
     constexpr const char* KeyMaxValue = "MaxValue";
 
     constexpr const char* KeyVisUnit = "VisUnit";
+
+    struct [[codegen::Dictionary(KameleonVolumeToRawTask)]] Parameters {
+        // The cdf file to extract data from
+        std::filesystem::path input;
+
+        // The raw volume file to export data to
+        std::string rawVolumeOutput [[codegen::annotation("A valid filepath")]];
+
+        // The Lua dictionary file to export metadata to
+        std::string dictionaryOutput [[codegen::annotation("A valid filepath")]];
+
+        // The variable name to read from the kameleon dataset
+        std::string variable [[codegen::annotation("A valid kameleon variable")]];
+
+        // A vector representing the number of cells in each dimension
+        glm::ivec3 dimensions;
+
+        // A vector representing the lower bound of the domain, in the native kameleon
+        // grid units
+        std::optional<glm::vec3> lowerDomainBound;
+
+        // A vector representing the lower bound of the domain, in the native kameleon
+        // grid units
+        std::optional<glm::vec3> upperDomainBound;
+
+        // The unit of the data
+        std::optional<std::string> visUnit
+            [[codegen::annotation("A valid kameleon unit")]];
+    };
+#include "kameleonvolumetorawtask_codegen.cpp"
 } // namespace
 
 namespace openspace::kameleonvolume {
 
 documentation::Documentation KameleonVolumeToRawTask::documentation() {
-    using namespace documentation;
-    return {
-        "KameleonVolumeToRawTask",
-        "kameleon_metadata_to_json_task",
-        {
-            {
-                KeyInput,
-                new StringAnnotationVerifier("A file path to a cdf file"),
-                Optional::No,
-                "The cdf file to extract data from",
-            },
-            {
-                KeyRawVolumeOutput,
-                new StringAnnotationVerifier("A valid filepath"),
-                Optional::No,
-                "The raw volume file to export data to",
-            },
-            {
-                KeyDictionaryOutput,
-                new StringAnnotationVerifier("A valid filepath"),
-                Optional::No,
-                "The lua dictionary file to export metadata to",
-            },
-            {
-                KeyVariable,
-                new StringAnnotationVerifier("A valid kameleon variable"),
-                Optional::No,
-                "The variable name to read from the kameleon dataset",
-            },
-            {
-                KeyDimensions,
-                new DoubleVector3Verifier,
-                Optional::No,
-                "A vector representing the number of cells in each dimension",
-            },
-            {
-                KeyLowerDomainBound,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                "A vector representing the lower bound of the domain, "
-                "in the native kameleon grid units",
-            },
-            {
-                KeyUpperDomainBound,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                "A vector representing the lower bound of the domain, "
-                "in the native kameleon grid units"
-            },
-            {
-                KeyVisUnit,
-                new StringAnnotationVerifier("A valid kameleon unit"),
-                Optional::Yes,
-                "The unit of the data",
-            }
-        }
-    };
+    return codegen::doc<Parameters>("kameleon_metadata_to_json_task");
 }
 
-
 KameleonVolumeToRawTask::KameleonVolumeToRawTask(const ghoul::Dictionary& dictionary) {
-    openspace::documentation::testSpecificationAndThrow(
-        documentation(),
-        dictionary,
-        "KameleonVolumeToRawTask"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _inputPath = absPath(dictionary.value<std::string>(KeyInput));
-    _rawVolumeOutputPath = absPath(dictionary.value<std::string>(KeyRawVolumeOutput));
-    _dictionaryOutputPath = absPath(dictionary.value<std::string>(KeyDictionaryOutput));
-    _variable = dictionary.value<std::string>(KeyVariable);
-    _dimensions = glm::uvec3(dictionary.value<glm::dvec3>(KeyDimensions));
+    _inputPath = absPath(p.input.string());
+    _rawVolumeOutputPath = absPath(p.rawVolumeOutput);
+    _dictionaryOutputPath = absPath(p.dictionaryOutput);
+    _variable = p.variable;
+    _dimensions = p.dimensions;
 
-    if (dictionary.hasKey(KeyLowerDomainBound)) {
-        _lowerDomainBound = dictionary.value<glm::dvec3>(KeyLowerDomainBound);
+    if (p.lowerDomainBound.has_value()) {
+        _lowerDomainBound = *p.lowerDomainBound;
     }
     else {
         _autoDomainBounds = true;
     }
-    if (dictionary.hasKey(KeyUpperDomainBound)) {
-        _upperDomainBound = dictionary.value<glm::dvec3>(KeyUpperDomainBound);
+
+    if (p.upperDomainBound.has_value()) {
+        _upperDomainBound = *p.upperDomainBound;
     }
     else {
         _autoDomainBounds = true;
@@ -147,7 +115,7 @@ std::string KameleonVolumeToRawTask::description() {
 }
 
 void KameleonVolumeToRawTask::perform(const Task::ProgressCallback& progressCallback) {
-    KameleonVolumeReader reader(_inputPath);
+    KameleonVolumeReader reader(_inputPath.string());
 
     std::array<std::string, 3> variables = reader.gridVariableNames();
 
@@ -174,7 +142,7 @@ void KameleonVolumeToRawTask::perform(const Task::ProgressCallback& progressCall
 
     progressCallback(0.5f);
 
-    volume::RawVolumeWriter<float> writer(_rawVolumeOutputPath);
+    volume::RawVolumeWriter<float> writer(_rawVolumeOutputPath.string());
     writer.write(*rawVolume);
 
     progressCallback(0.9f);
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
index b187bfcc59..040f9c998f 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
@@ -28,6 +28,7 @@
 #include <openspace/util/task.h>
 
 #include <ghoul/glm.h>
+#include <filesystem>
 #include <string>
 
 namespace openspace::kameleonvolume {
@@ -42,9 +43,9 @@ public:
     static documentation::Documentation documentation();
 
 private:
-    std::string _inputPath;
-    std::string _rawVolumeOutputPath;
-    std::string _dictionaryOutputPath;
+    std::filesystem::path _inputPath;
+    std::filesystem::path _rawVolumeOutputPath;
+    std::filesystem::path _dictionaryOutputPath;
 
     std::string _variable;
     std::string _units;
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index 6e75384f79..fef5801605 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -54,6 +54,7 @@
 #include <ghoul/opengl/texture.h>
 #include <algorithm>
 #include <chrono>
+#include <filesystem>
 #include <fstream>
 #include <iterator>
 
@@ -170,7 +171,7 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
     , _scaling(ScalingInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(10.f))
 {
     if (dictionary.hasValue<std::string>(KeyDataSource)) {
-        _filename = absPath(dictionary.value<std::string>(KeyDataSource));
+        _filename = absPath(dictionary.value<std::string>(KeyDataSource)).string();
     }
     else {
         LERROR(fmt::format("Node did not contain a valid '{}'", KeyDataSource));
@@ -222,7 +223,7 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
     if (dictionary.hasValue<std::string>(KeyTransferFunction)) {
         _transferFunctionPath = absPath(
             dictionary.value<std::string>(KeyTransferFunction)
-        );
+        ).string();
         _transferFunction = std::make_shared<TransferFunction>(_transferFunctionPath);
     }
     else {
@@ -454,14 +455,12 @@ bool RenderableMultiresVolume::initializeSelector() {
     switch (_selector) {
         case Selector::TF:
             if (_errorHistogramManager) {
-                std::stringstream cacheName;
-                ghoul::filesystem::File f = _filename;
-                cacheName << f.baseName() << "_" << nHistograms << "_errorHistograms";
-                std::string cacheFilename;
-                cacheFilename = FileSys.cacheManager()->cachedFilename(
-                    cacheName.str(),
-                    "",
-                    ghoul::filesystem::CacheManager::Persistent::Yes
+                 std::string cacheFilename = FileSys.cacheManager()->cachedFilename(
+                     fmt::format(
+                         "{}_{}_errorHistograms",
+                         std::filesystem::path(_filename).stem().string(), nHistograms
+                     ),
+                     ""
                 );
                 std::ifstream cacheFile(cacheFilename, std::ios::in | std::ios::binary);
                 if (cacheFile.is_open()) {
@@ -472,12 +471,14 @@ bool RenderableMultiresVolume::initializeSelector() {
                     );
                     success &= _errorHistogramManager->loadFromFile(cacheFilename);
                 }
-                else if (_errorHistogramsPath != "") {
+                else if (!_errorHistogramsPath.empty()) {
                     // Read histograms from scene data.
                     LINFO(fmt::format(
                         "Loading histograms from scene data: {}", _errorHistogramsPath
                     ));
-                    success &= _errorHistogramManager->loadFromFile(_errorHistogramsPath);
+                    success &= _errorHistogramManager->loadFromFile(
+                        _errorHistogramsPath.string()
+                    );
                 }
                 else {
                     // Build histograms from tsp file.
@@ -494,14 +495,11 @@ bool RenderableMultiresVolume::initializeSelector() {
 
         case Selector::SIMPLE:
             if (_histogramManager) {
-                std::stringstream cacheName;
-                ghoul::filesystem::File f = _filename;
-                cacheName << f.baseName() << "_" << nHistograms << "_histograms";
-                std::string cacheFilename;
-                cacheFilename = FileSys.cacheManager()->cachedFilename(
-                    cacheName.str(),
-                    "",
-                    ghoul::filesystem::CacheManager::Persistent::Yes
+                std::string cacheFilename = FileSys.cacheManager()->cachedFilename(
+                    fmt::format("{}_{}_histogram",
+                        std::filesystem::path(_filename).stem().string(), nHistograms
+                    ),
+                    ""
                 );
                 std::ifstream cacheFile(cacheFilename, std::ios::in | std::ios::binary);
                 if (cacheFile.is_open()) {
@@ -528,12 +526,12 @@ bool RenderableMultiresVolume::initializeSelector() {
 
         case Selector::LOCAL:
             if (_localErrorHistogramManager) {
-                ghoul::filesystem::File f = _filename;
-                std::string cacheFilename;
-                cacheFilename = FileSys.cacheManager()->cachedFilename(
-                    fmt::format("{}_{}_localErrorHistograms", f.baseName(), nHistograms),
-                    "",
-                    ghoul::filesystem::CacheManager::Persistent::Yes
+                 std::string cacheFilename = FileSys.cacheManager()->cachedFilename(
+                    fmt::format(
+                        "{}_{}_localErrorHistograms",
+                        std::filesystem::path(_filename).stem().string(), nHistograms
+                    ),
+                    ""
                 );
                 std::ifstream cacheFile(cacheFilename, std::ios::in | std::ios::binary);
                 if (cacheFile.is_open()) {
@@ -628,8 +626,9 @@ void RenderableMultiresVolume::update(const UpdateData& data) {
 
         // Make sure that the directory exists
         ghoul::filesystem::File file(_statsFileName);
-        ghoul::filesystem::Directory directory(file.directoryName());
-        FileSys.createDirectory(directory, ghoul::filesystem::FileSystem::Recursive::Yes);
+        std::filesystem::path directory =
+            std::filesystem::path(_statsFileName).parent_path();
+        std::filesystem::create_directories(directory);
 
         std::ofstream ofs(_statsFileName, std::ofstream::out);
 
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.h b/modules/multiresvolume/rendering/renderablemultiresvolume.h
index 28a9d56994..1b4c71914d 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.h
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.h
@@ -33,6 +33,7 @@
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <chrono>
+#include <filesystem>
 
 namespace ghoul { class Dictionary; }
 namespace ghoul::filesystem { class File; }
@@ -122,7 +123,7 @@ private:
     std::string _volumeName;
 
     std::string _transferFunctionPath;
-    std::string _errorHistogramsPath;
+    std::filesystem::path _errorHistogramsPath;
 
     std::shared_ptr<TransferFunction> _transferFunction;
 
diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp
index e056dbaeb4..124d1cea24 100644
--- a/modules/multiresvolume/rendering/tsp.cpp
+++ b/modules/multiresvolume/rendering/tsp.cpp
@@ -30,6 +30,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/logging/logmanager.h>
+#include <filesystem>
 #include <numeric>
 #include <queue>
 
@@ -506,11 +507,9 @@ bool TSP::readCache() {
     if (!FileSys.cacheManager())
         return false;
 
-    ghoul::filesystem::File f = _filename;
     std::string cacheFilename = FileSys.cacheManager()->cachedFilename(
-        f.baseName(),
-        "",
-        ghoul::filesystem::CacheManager::Persistent::Yes
+        std::filesystem::path(_filename).stem(),
+        ""
     );
 
     std::ifstream file(cacheFilename, std::ios::in | std::ios::binary);
@@ -546,11 +545,9 @@ bool TSP::writeCache() {
         return false;
     }
 
-    ghoul::filesystem::File f = _filename;
     std::string cacheFilename = FileSys.cacheManager()->cachedFilename(
-        f.baseName(),
-        "",
-        ghoul::filesystem::CacheManager::Persistent::Yes
+        std::filesystem::path(_filename).stem(),
+        ""
     );
 
     std::ofstream file(cacheFilename, std::ios::out | std::ios::binary);
diff --git a/modules/server/include/topics/luascripttopic.h b/modules/server/include/topics/luascripttopic.h
index 7ed757e3dd..49b81f37f4 100644
--- a/modules/server/include/topics/luascripttopic.h
+++ b/modules/server/include/topics/luascripttopic.h
@@ -36,8 +36,9 @@ public:
 
     void handleJson(const nlohmann::json& json) override;
     bool isDone() const override;
+
 private:
-    void runScript(const std::string& script, bool returnValue);
+    void runScript(std::string script, bool returnValue);
 
     bool _waitingForReturnValue = true;
 };
diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp
index b718ea4838..d2140b6e75 100644
--- a/modules/server/src/topics/luascripttopic.cpp
+++ b/modules/server/src/topics/luascripttopic.cpp
@@ -176,7 +176,7 @@ void LuaScriptTopic::handleJson(const nlohmann::json& json) {
     }
 }
 
-void LuaScriptTopic::runScript(const std::string& script, bool shouldReturn) {
+void LuaScriptTopic::runScript(std::string script, bool shouldReturn) {
     scripting::ScriptEngine::ScriptCallback callback;
     if (shouldReturn) {
         callback = [this](ghoul::Dictionary data) {
diff --git a/modules/server/src/topics/sessionrecordingtopic.cpp b/modules/server/src/topics/sessionrecordingtopic.cpp
index 9b39e739c5..1a724b24fd 100644
--- a/modules/server/src/topics/sessionrecordingtopic.cpp
+++ b/modules/server/src/topics/sessionrecordingtopic.cpp
@@ -124,6 +124,9 @@ void SessionRecordingTopic::sendJsonData() {
             case SessionRecording::SessionState::Playback:
                 stateString = "playing";
                 break;
+            case SessionRecording::SessionState::PlaybackPaused:
+                stateString = "playing-paused";
+                break;
             default:
                 stateString = "idle";
                 break;
diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt
index 583e3e89ab..09e56ed641 100644
--- a/modules/space/CMakeLists.txt
+++ b/modules/space/CMakeLists.txt
@@ -25,6 +25,7 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
+  speckloader.h
   rendering/planetgeometry.h
   rendering/renderableconstellationbounds.h
   rendering/renderablehabitablezone.h
@@ -43,6 +44,7 @@ set(HEADER_FILES
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
+  speckloader.cpp
   rendering/planetgeometry.cpp
   rendering/renderableconstellationbounds.cpp
   rendering/renderablehabitablezone.cpp
diff --git a/modules/space/rendering/planetgeometry.cpp b/modules/space/rendering/planetgeometry.cpp
index ec68224b61..8216093752 100644
--- a/modules/space/rendering/planetgeometry.cpp
+++ b/modules/space/rendering/planetgeometry.cpp
@@ -40,9 +40,7 @@ namespace {
 namespace openspace::planetgeometry {
 
 documentation::Documentation PlanetGeometry::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_geometry_planet";
-    return doc;
+    return codegen::doc<Parameters>("space_geometry_planet");
 }
 
 std::unique_ptr<PlanetGeometry> PlanetGeometry::createFromDictionary(
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index e6f2821592..a9193c6294 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -99,11 +99,8 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableConstellationBounds::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_renderable_constellationbounds";
-    return doc;
-} // namespace
-
+    return codegen::doc<Parameters>("space_renderable_constellationbounds");
+}
 
 RenderableConstellationBounds::RenderableConstellationBounds(
     const ghoul::Dictionary& dictionary)
@@ -233,7 +230,7 @@ bool RenderableConstellationBounds::loadVertexFile() {
         return false;
     }
 
-    std::string fileName = absPath(_vertexFilename);
+    std::filesystem::path fileName = absPath(_vertexFilename);
     std::ifstream file;
     file.open(fileName);
     if (!file.good()) {
@@ -273,7 +270,7 @@ bool RenderableConstellationBounds::loadVertexFile() {
             LERRORC(
                 "RenderableConstellationBounds",
                 fmt::format(
-                    "Error reading file '{}' at line #{}", fileName, currentLineNumber
+                    "Error reading file {} at line #{}", fileName, currentLineNumber
                 )
             );
             break;
diff --git a/modules/space/rendering/renderableconstellationbounds.h b/modules/space/rendering/renderableconstellationbounds.h
index c6ea6e606c..5af808d7c5 100644
--- a/modules/space/rendering/renderableconstellationbounds.h
+++ b/modules/space/rendering/renderableconstellationbounds.h
@@ -66,7 +66,7 @@ private:
     struct ConstellationBound {
         std::string constellationAbbreviation; ///< The abbreviation of the constellation
         std::string constellationFullName;
-        bool isEnabled;
+        bool isEnabled = false;
         GLsizei startIndex; ///< The index of the first vertex describing the bounds
         GLsizei nVertices; ///< The number of vertices describing the bounds
     };
diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp
index d540d75906..fb5a7ca4fc 100644
--- a/modules/space/rendering/renderablehabitablezone.cpp
+++ b/modules/space/rendering/renderablehabitablezone.cpp
@@ -40,7 +40,7 @@
 #include <optional>
 
 namespace {
-    constexpr const char _loggerCat[] = "RenderableHabitableZone";
+    constexpr const char* _loggerCat = "RenderableHabitableZone";
 
     constexpr const std::array<const char*, 6> UniformNames = {
         "modelViewProjectionTransform", "opacity", "width", "transferFunctionTexture",
@@ -96,8 +96,9 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableHabitableZone::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_renderablehabitablezone";
+    documentation::Documentation doc = codegen::doc<Parameters>(
+        "space_renderablehabitablezone"
+    );
 
     // @TODO cleanup
     // Insert the parents documentation entries until we have a verifier that can deal
@@ -135,6 +136,7 @@ RenderableHabitableZone::RenderableHabitableZone(const ghoul::Dictionary& dictio
     // The user should not be able to change this property. It's just used to communicate
     // the different rendering that happens outside of this interval
     addProperty(_kopparapuTeffInterval);
+    _kopparapuTeffInterval.setViewOption(properties::Property::ViewOptions::MinMaxRange);
     _kopparapuTeffInterval.setReadOnly(true);
 
     // Make parent's size related properties read only. We want to set them based on the
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 040354458d..e54329e9ab 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -262,9 +262,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableOrbitalKepler::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_renderableorbitalkepler";
-    return doc;
+    return codegen::doc<Parameters>("space_renderableorbitalkepler");
 }
 
 double RenderableOrbitalKepler::calculateSemiMajorAxis(double meanMotion) const {
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index 6e45f719b6..e013449b9c 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -60,10 +60,10 @@ namespace {
     constexpr openspace::properties::Property::PropertyInfo OffsetInfo = {
         "Offset",
         "Offset",
-        "This value is used to limit the width of the rings.Each of the two values is a "
-        "value between 0 and 1, where 0 is the center of the ring and 1 is the maximum "
-        "extent at the radius. If this value is, for example {0.5, 1.0}, the ring is "
-        "only shown between radius/2 and radius. It defaults to {0.0, 1.0}."
+        "This value is used to limit the width of the rings. Each of the two values is "
+        "a value between 0 and 1, where 0 is the center of the ring and 1 is the "
+        "maximum extent at the radius. For example, if the value is {0.5, 1.0}, the "
+        "ring is only shown between radius/2 and radius. It defaults to {0.0, 1.0}."
     };
 
     constexpr openspace::properties::Property::PropertyInfo NightFactorInfo = {
@@ -103,9 +103,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableRings::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_renderable_rings";
-    return doc;
+    return codegen::doc<Parameters>("space_renderable_rings");
 }
 
 RenderableRings::RenderableRings(const ghoul::Dictionary& dictionary)
@@ -125,16 +123,17 @@ RenderableRings::RenderableRings(const ghoul::Dictionary& dictionary)
     _size.onChange([&]() { _planeIsDirty = true; });
     addProperty(_size);
 
-    _texturePath = absPath(p.texture);
-    _textureFile = std::make_unique<File>(_texturePath);
+    _texturePath = absPath(p.texture).string();
+    _textureFile = std::make_unique<File>(_texturePath.value());
 
     _offset = p.offset.value_or(_offset);
+    _offset.setViewOption(properties::Property::ViewOptions::MinMaxRange);
     addProperty(_offset);
 
     _texturePath.onChange([&]() { loadTexture(); });
     addProperty(_texturePath);
 
-    _textureFile->setCallback([&](const File&) { _textureIsDirty = true; });
+    _textureFile->setCallback([this]() { _textureIsDirty = true; });
 
     _nightFactor = p.nightFactor.value_or(_nightFactor);
     addProperty(_nightFactor);
@@ -236,23 +235,23 @@ void RenderableRings::loadTexture() {
         using namespace ghoul::io;
         using namespace ghoul::opengl;
         std::unique_ptr<Texture> texture = TextureReader::ref().loadTexture(
-            absPath(_texturePath)
+            absPath(_texturePath).string()
         );
 
         if (texture) {
             LDEBUGC(
                 "RenderableRings",
-                fmt::format("Loaded texture from '{}'", absPath(_texturePath))
+                fmt::format("Loaded texture from {}", absPath(_texturePath))
             );
             _texture = std::move(texture);
 
             _texture->uploadTexture();
             _texture->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
 
-            _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath);
-            _textureFile->setCallback(
-                [&](const ghoul::filesystem::File&) { _textureIsDirty = true; }
+            _textureFile = std::make_unique<ghoul::filesystem::File>(
+                _texturePath.value()
             );
+            _textureFile->setCallback([this]() { _textureIsDirty = true; });
         }
     }
 }
diff --git a/modules/space/rendering/renderablesatellites.cpp b/modules/space/rendering/renderablesatellites.cpp
index f808be2147..7bd47a3648 100644
--- a/modules/space/rendering/renderablesatellites.cpp
+++ b/modules/space/rendering/renderablesatellites.cpp
@@ -41,6 +41,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <chrono>
 #include <math.h>
+#include <filesystem>
 #include <fstream>
 #include <vector>
 
@@ -63,8 +64,9 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableSatellites::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_renderablesatellites";
+    documentation::Documentation doc = codegen::doc<Parameters>(
+        "space_renderablesatellites"
+    );
 
     // Insert the parents documentation entries until we have a verifier that can deal
     // with class hierarchy
@@ -105,7 +107,7 @@ RenderableSatellites::RenderableSatellites(const ghoul::Dictionary& dictionary)
 }
 
 void RenderableSatellites::readDataFile(const std::string& filename) {
-    if (!FileSys.fileExists(filename)) {
+    if (!std::filesystem::is_regular_file(filename)) {
         throw ghoul::RuntimeError(fmt::format(
             "Satellite TLE file {} does not exist", filename
         ));
diff --git a/modules/space/rendering/renderablesmallbody.cpp b/modules/space/rendering/renderablesmallbody.cpp
index 72414c3453..3236bab79a 100644
--- a/modules/space/rendering/renderablesmallbody.cpp
+++ b/modules/space/rendering/renderablesmallbody.cpp
@@ -41,6 +41,7 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/logging/logmanager.h>
 #include <chrono>
+#include <filesystem>
 #include <fstream>
 #include <math.h>
 #include <vector>
@@ -97,8 +98,9 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableSmallBody::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_renderablesmallbody";
+    documentation::Documentation doc = codegen::doc<Parameters>(
+        "space_renderablesmallbody"
+    );
 
     // Insert the parents documentation entries until we have a verifier that can deal
     // with class hierarchy
@@ -172,7 +174,7 @@ RenderableSmallBody::RenderableSmallBody(const ghoul::Dictionary& dictionary)
 }
 
 void RenderableSmallBody::readDataFile(const std::string& filename) {
-    if (!FileSys.fileExists(filename)) {
+    if (!std::filesystem::is_regular_file(filename)) {
         throw ghoul::RuntimeError(fmt::format(
             "JPL SBDB file {} does not exist.", filename
         ));
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index eefa4ba887..89b4fdf9a5 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -52,21 +52,21 @@ namespace {
     constexpr const char* _loggerCat = "RenderableStars";
 
     constexpr const std::array<const char*, 17> UniformNames = {
-        "modelMatrix", "cameraUp", "cameraViewProjectionMatrix",
-        "colorOption", "magnitudeExponent", "eyePosition", "psfParamConf",
-        "lumCent", "radiusCent", "brightnessCent", "colorTexture",
-        "alphaValue", "psfTexture", "otherDataTexture", "otherDataRange",
-        "filterOutOfRange", "fixedColor"
+        "modelMatrix", "cameraUp", "cameraViewProjectionMatrix", "colorOption",
+        "magnitudeExponent", "eyePosition", "psfParamConf", "lumCent", "radiusCent",
+        "brightnessCent", "colorTexture", "alphaValue", "psfTexture", "otherDataTexture",
+        "otherDataRange", "filterOutOfRange", "fixedColor"
     };
 
-    constexpr int8_t CurrentCacheVersion = 3;
-
     constexpr const int RenderOptionPointSpreadFunction = 0;
     constexpr const int RenderOptionTexture = 1;
 
     constexpr const int PsfMethodSpencer = 0;
     constexpr const int PsfMethodMoffat = 1;
 
+    constexpr const int PsfTextureSize = 64;
+    constexpr const int ConvolvedfTextureSize = 257;
+
     constexpr double PARSEC = 0.308567756E17;
 
     struct ColorVBOLayout {
@@ -120,6 +120,61 @@ namespace {
         "to its color. The texture is used as a one dimensional lookup function."
     };
 
+    constexpr openspace::properties::Property::PropertyInfo MappingBvInfo = {
+        "MappingBV",
+        "Mapping (bv-color)",
+        "The name of the variable in the speck file that is used as the b-v color "
+        "variable"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo MappingLuminanceInfo = {
+        "MappingLuminance",
+        "Mapping (luminance)",
+        "The name of the variable in the speck file that is used as the luminance "
+        "variable"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo MappingAbsMagnitudeInfo = {
+        "MappingAbsMagnitude",
+        "Mapping (absolute magnitude)",
+        "The name of the variable in the speck file that is used as the absolute "
+        "magnitude variable"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo MappingAppMagnitudeInfo = {
+        "MappingAppMagnitude",
+        "Mapping (apparent magnitude)",
+        "The name of the variable in the speck file that is used as the apparent "
+        "magnitude variable"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo MappingVxInfo = {
+        "MappingVx",
+        "Mapping (vx)",
+        "The name of the variable in the speck file that is used as the star velocity "
+        "along the x-axis"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo MappingVyInfo = {
+        "MappingVy",
+        "Mapping (vy)",
+        "The name of the variable in the speck file that is used as the star velocity "
+        "along the y-axis"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo MappingVzInfo = {
+        "MappingVz",
+        "Mapping (vz)",
+        "The name of the variable in the speck file that is used as the star velocity "
+        "along the z-axis"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo MappingSpeedInfo = {
+        "MappingSpeed",
+        "Mapping (speed)",
+        "The name of the variable in the speck file that is used as the speed"
+    };
+
     constexpr openspace::properties::Property::PropertyInfo ColorOptionInfo = {
         "ColorOption",
         "Color Option",
@@ -159,12 +214,6 @@ namespace {
         "or filtered away"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo EnableTestGridInfo = {
-        "EnableTestGrid",
-        "Enable Test Grid",
-        "Set it to true for rendering the test grid."
-    };
-
     // Old Method
     constexpr openspace::properties::Property::PropertyInfo PsfTextureInfo = {
         "Texture",
@@ -173,11 +222,11 @@ namespace {
         "stars."
     };
 
-    /*constexpr openspace::properties::Property::PropertyInfo ShapeTextureInfo = {
-        "ShapeTexture",
-        "Shape Texture to be convolved",
-        "The path to the texture that should be used as the base shape for the stars."
-    };*/
+    //constexpr openspace::properties::Property::PropertyInfo ShapeTextureInfo = {
+    //    "ShapeTexture",
+    //    "Shape Texture to be convolved",
+    //    "The path to the texture that should be used as the base shape for the stars."
+    //};
 
     // PSF
     constexpr openspace::properties::Property::PropertyInfo MagnitudeExponentInfo = {
@@ -344,23 +393,56 @@ namespace {
         // [[codegen::verbatim(MagnitudeExponentInfo.description)]]
         std::optional<float> magnitudeExponent;
 
-        // [[codegen::verbatim(EnableTestGridInfo.description)]]
-        std::optional<bool> enableTestGrid;
+        enum class RenderMethod {
+            PSF,
+            TextureBased [[codegen::key("Texture Based")]]
+        };
 
         // [[codegen::verbatim(RenderMethodOptionInfo.description)]]
-        std::string renderMethod;
+        RenderMethod renderMethod;
 
         // [[codegen::verbatim(PsfTextureInfo.description)]]
         std::filesystem::path texture;
 
+        enum class SizeComposition {
+            AppBrightness [[codegen::key("App Brightness")]],
+            LumSize [[codegen::key("Lum and Size")]],
+            LumSizeAppBrightness [[codegen::key("Lum, Size and App Brightness")]],
+            AbsMagnitude [[codegen::key("Abs Magnitude")]],
+            AppMagnitude [[codegen::key("App Magnitude")]],
+            DistanceModulus [[codegen::key("Distance Modulus")]]
+        };
+
         // [[codegen::verbatim(SizeCompositionOptionInfo.description)]]
-        std::optional<std::string> sizeComposition;
+        std::optional<SizeComposition> sizeComposition;
+
+        struct DataMapping {
+            // [[codegen::verbatim(MappingBvInfo.description)]]
+            std::optional<std::string> bv;
+            // [[codegen::verbatim(MappingLuminanceInfo.description)]]
+            std::optional<std::string> luminance;
+            // [[codegen::verbatim(MappingAbsMagnitudeInfo.description)]]
+            std::optional<std::string> absoluteMagnitude;
+            // [[codegen::verbatim(MappingAppMagnitudeInfo.description)]]
+            std::optional<std::string> apparentMagnitude;
+            // [[codegen::verbatim(MappingVxInfo.description)]]
+            std::optional<std::string> vx;
+            // [[codegen::verbatim(MappingVyInfo.description)]]
+            std::optional<std::string> vy;
+            // [[codegen::verbatim(MappingVzInfo.description)]]
+            std::optional<std::string> vz;
+            // [[codegen::verbatim(MappingSpeedInfo.description)]]
+            std::optional<std::string> speed;
+        };
+        // The mappings between data values and the variable names specified in the speck
+        // file
+        DataMapping dataMapping;
 
         // [[codegen::verbatim(FadeInDistancesInfo.description)]]
         std::optional<glm::dvec2> fadeInDistances;
 
         // [[codegen::verbatim(DisableFadeInInfo.description)]]
-        std::optional<bool> distableFadeIn;
+        std::optional<bool> disableFadeIn;
     };
 #include "renderablestars_codegen.cpp"
 }  // namespace
@@ -368,9 +450,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableStars::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_renderablestars";
-    return doc;
+    return codegen::doc<Parameters>("space_renderablestars");
 }
 
 RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
@@ -378,6 +458,17 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     , _speckFile(SpeckFileInfo)
     , _colorTexturePath(ColorTextureInfo)
     //, _shapeTexturePath(ShapeTextureInfo)
+    , _dataMappingContainer({ "DataMapping", "Data Mapping" })
+    , _dataMapping{
+        properties::StringProperty(MappingBvInfo),
+        properties::StringProperty(MappingLuminanceInfo),
+        properties::StringProperty(MappingAbsMagnitudeInfo),
+        properties::StringProperty(MappingAppMagnitudeInfo),
+        properties::StringProperty(MappingVxInfo),
+        properties::StringProperty(MappingVyInfo),
+        properties::StringProperty(MappingVzInfo),
+        properties::StringProperty(MappingSpeedInfo)
+    }
     , _colorOption(ColorOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _otherDataOption(
         OtherDataOptionInfo,
@@ -411,7 +502,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     , _p2Param(P2ParamInfo, 0.138f, 0.f, 1.f)
     , _spencerAlphaConst(AlphaConstInfo, 0.02f, 0.000001f, 5.f)
     , _moffatPSFParamOwner(MoffatPSFParamOwnerInfo)
-    , _FWHMConst(FWHMInfo, 10.4f, -100.f, 1000.f)
+    , _FWHMConst(FWHMInfo, 10.4f, 0.f, 100.f)
     , _moffatBetaConst(BetaInfo, 4.765f, 0.f, 100.f)
     , _renderingMethodOption(
         RenderMethodOptionInfo,
@@ -420,7 +511,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     , _userProvidedTextureOwner(UserProvidedTextureOptionInfo)
     , _parametersOwner(ParametersOwnerOptionInfo)
     , _moffatMethodOwner(MoffatMethodOptionInfo)
-    , _fadeInDistance(
+    , _fadeInDistances(
         FadeInDistancesInfo,
         glm::vec2(0.f),
         glm::vec2(0.f),
@@ -435,20 +526,54 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
+    _dataMapping.bvColor = p.dataMapping.bv.value_or("");
+    _dataMapping.bvColor.onChange([this]() { _dataIsDirty = true; });
+    _dataMappingContainer.addProperty(_dataMapping.bvColor);
+    
+    _dataMapping.luminance = p.dataMapping.luminance.value_or("");
+    _dataMapping.luminance.onChange([this]() { _dataIsDirty = true; });
+    _dataMappingContainer.addProperty(_dataMapping.luminance);
+    
+    _dataMapping.absoluteMagnitude = p.dataMapping.absoluteMagnitude.value_or("");
+    _dataMapping.absoluteMagnitude.onChange([this]() { _dataIsDirty = true; });
+    _dataMappingContainer.addProperty(_dataMapping.absoluteMagnitude);
+    
+    _dataMapping.apparentMagnitude = p.dataMapping.apparentMagnitude.value_or("");
+    _dataMapping.apparentMagnitude.onChange([this]() { _dataIsDirty = true; });
+    _dataMappingContainer.addProperty(_dataMapping.apparentMagnitude);
+    
+    _dataMapping.vx = p.dataMapping.vx.value_or("");
+    _dataMapping.vx.onChange([this]() { _dataIsDirty = true; });
+    _dataMappingContainer.addProperty(_dataMapping.vx);
+    
+    _dataMapping.vy = p.dataMapping.vy.value_or("");
+    _dataMapping.vy.onChange([this]() { _dataIsDirty = true; });
+    _dataMappingContainer.addProperty(_dataMapping.vy);
+    
+    _dataMapping.vz = p.dataMapping.vz.value_or("");
+    _dataMapping.vz.onChange([this]() { _dataIsDirty = true; });
+    _dataMappingContainer.addProperty(_dataMapping.vz);
+    
+    _dataMapping.speed = p.dataMapping.speed.value_or("");
+    _dataMapping.speed.onChange([this]() { _dataIsDirty = true; });
+    _dataMappingContainer.addProperty(_dataMapping.speed);
+    
+    addPropertySubOwner(_dataMappingContainer);
+
     _speckFile = p.speckFile.string();
     _speckFile.onChange([&]() { _speckFileIsDirty = true; });
     addProperty(_speckFile);
 
     _colorTexturePath = p.colorMap.string();
-    _colorTextureFile = std::make_unique<File>(_colorTexturePath);
+    _colorTextureFile = std::make_unique<File>(_colorTexturePath.value());
 
-    /*_shapeTexturePath = absPath(dictionary.value<std::string>(
-        ShapeTextureInfo.identifier
-        ));
-    _shapeTextureFile = std::make_unique<File>(_shapeTexturePath);*/
+    //_shapeTexturePath = absPath(dictionary.value<std::string>(
+    //    ShapeTextureInfo.identifier
+    //    ));
+    //_shapeTextureFile = std::make_unique<File>(_shapeTexturePath);
 
     if (p.otherDataColorMap.has_value()) {
-        _otherDataColorMapPath = absPath(*p.otherDataColorMap);
+        _otherDataColorMapPath = absPath(*p.otherDataColorMap).string();
     }
 
     _fixedColor.setViewOption(properties::Property::ViewOptions::Color, true);
@@ -484,23 +609,15 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     addProperty(_colorOption);
 
     _colorTexturePath.onChange([&] { _colorTextureIsDirty = true; });
-    _colorTextureFile->setCallback([&](const File&) {
-        _colorTextureIsDirty = true;
-    });
+    _colorTextureFile->setCallback([this]() { _colorTextureIsDirty = true; });
     addProperty(_colorTexturePath);
 
-    /*_shapeTexturePath.onChange([&] { _shapeTextureIsDirty = true; });
-    _shapeTextureFile->setCallback([&](const File&) {
-        _shapeTextureIsDirty = true;
-        });
-    addProperty(_shapeTexturePath);*/
-
-    _enableTestGrid = p.enableTestGrid.value_or(_enableTestGrid);
     _queuedOtherData = p.otherData.value_or(_queuedOtherData);
 
     _otherDataOption.onChange([&]() { _dataIsDirty = true; });
     addProperty(_otherDataOption);
 
+    _otherDataRange.setViewOption(properties::Property::ViewOptions::MinMaxRange);
     addProperty(_otherDataRange);
 
     addProperty(_otherDataColorMapPath);
@@ -519,19 +636,21 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     _renderingMethodOption.addOption(RenderOptionTexture, "Textured Based");
     addProperty(_renderingMethodOption);
 
-    if (p.renderMethod == "PSF") {
+    if (p.renderMethod == Parameters::RenderMethod::PSF) {
         _renderingMethodOption = RenderOptionPointSpreadFunction;
     }
-    else if (p.renderMethod == "Texture Based") {
+    else {
         _renderingMethodOption = RenderOptionTexture;
     }
 
-    _pointSpreadFunctionTexturePath = absPath(p.texture.string());
-    _pointSpreadFunctionFile = std::make_unique<File>(_pointSpreadFunctionTexturePath);
-    _pointSpreadFunctionTexturePath.onChange([&]() {
+    _pointSpreadFunctionTexturePath = absPath(p.texture.string()).string();
+    _pointSpreadFunctionFile = std::make_unique<File>(
+        _pointSpreadFunctionTexturePath.value()
+    );
+    _pointSpreadFunctionTexturePath.onChange([this]() {
         _pointSpreadFunctionTextureIsDirty = true;
     });
-    _pointSpreadFunctionFile->setCallback([&](const File&) {
+    _pointSpreadFunctionFile->setCallback([this]() {
         _pointSpreadFunctionTextureIsDirty = true;
     });
     _userProvidedTextureOwner.addProperty(_pointSpreadFunctionTexturePath);
@@ -551,23 +670,25 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
 
 
     if (p.sizeComposition.has_value()) {
-        if (*p.sizeComposition == "App Brightness") {
-            _psfMultiplyOption = 0;
-        }
-        else if (*p.sizeComposition == "Lum and Size") {
-            _psfMultiplyOption = 1;
-        }
-        else if (*p.sizeComposition == "Lum, Size and App Brightness") {
-            _psfMultiplyOption = 2;
-        }
-        else if (*p.sizeComposition == "Abs Magnitude") {
-            _psfMultiplyOption = 3;
-        }
-        else if (*p.sizeComposition == "App Maginitude") {
-            _psfMultiplyOption = 4;
-        }
-        else if (*p.sizeComposition == "Distance Modulus") {
-            _psfMultiplyOption = 5;
+        switch (*p.sizeComposition) {
+            case Parameters::SizeComposition::AppBrightness:
+                _psfMultiplyOption = 0;
+                break;
+            case Parameters::SizeComposition::LumSize:
+                _psfMultiplyOption = 1;
+                break;
+            case Parameters::SizeComposition::LumSizeAppBrightness:
+                _psfMultiplyOption = 2;
+                break;
+            case Parameters::SizeComposition::AbsMagnitude:
+                _psfMultiplyOption = 3;
+                break;
+            case Parameters::SizeComposition::AppMagnitude:
+                _psfMultiplyOption = 4;
+                break;
+            case Parameters::SizeComposition::DistanceModulus:
+                _psfMultiplyOption = 5;
+                break;
         }
     }
     else {
@@ -607,9 +728,10 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
 
     if (p.fadeInDistances.has_value()) {
         glm::vec2 v = *p.fadeInDistances;
-        _fadeInDistance = v;
+        _fadeInDistances = v;
         _disableFadeInDistance = false;
-        addProperty(_fadeInDistance);
+        _fadeInDistances.setViewOption(properties::Property::ViewOptions::MinMaxRange);
+        addProperty(_fadeInDistances);
         addProperty(_disableFadeInDistance);
     }
 }
@@ -632,13 +754,16 @@ void RenderableStars::initializeGL() {
 
     loadData();
 
+    // We need to wait until after loading the data until we can see if the requested
+    // data value actually exists or not.  Once we determine the index, we no longer
+    // need the value and can clear it
     if (!_queuedOtherData.empty()) {
-        auto it = std::find(_dataNames.begin(), _dataNames.end(), _queuedOtherData);
-        if (it == _dataNames.end()) {
+        int idx = _dataset.index(_queuedOtherData);
+        if (idx == -1) {
             LERROR(fmt::format("Could not find other data column {}", _queuedOtherData));
         }
         else {
-            _otherDataOption = static_cast<int>(std::distance(_dataNames.begin(), it));
+            _otherDataOption = idx;
             _queuedOtherData.clear();
         }
     }
@@ -651,7 +776,7 @@ void RenderableStars::initializeGL() {
     glBindVertexArray(_psfVao);
     glBindBuffer(GL_ARRAY_BUFFER, _psfVbo);
 
-    const GLfloat vertexData[] = {
+    constexpr const std::array<GLfloat, 24> VertexData = {
         //x      y     s     t
         -1.f, -1.f, 0.f, 0.f,
          1.f,  1.f, 1.f, 1.f,
@@ -661,15 +786,8 @@ void RenderableStars::initializeGL() {
          1.f,  1.f, 1.f, 1.f
     };
 
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData, GL_STATIC_DRAW);
-    glVertexAttribPointer(
-        0,
-        4,
-        GL_FLOAT,
-        GL_FALSE,
-        sizeof(GLfloat) * 4,
-        nullptr
-    );
+    glBufferData(GL_ARRAY_BUFFER, sizeof(VertexData), VertexData.data(), GL_STATIC_DRAW);
+    glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), nullptr);
     glEnableVertexAttribArray(0);
     glBindVertexArray(0);
 
@@ -685,8 +803,8 @@ void RenderableStars::initializeGL() {
         GL_TEXTURE_2D,
         0,
         GL_RGBA8,
-        _psfTextureSize,
-        _psfTextureSize,
+        PsfTextureSize,
+        PsfTextureSize,
         0,
         GL_RGBA,
         GL_BYTE,
@@ -708,8 +826,8 @@ void RenderableStars::initializeGL() {
         GL_TEXTURE_2D,
         0,
         GL_RGBA8,
-        _convolvedfTextureSize,
-        _convolvedfTextureSize,
+        ConvolvedfTextureSize,
+        ConvolvedfTextureSize,
         0,
         GL_RGBA,
         GL_BYTE,
@@ -742,13 +860,12 @@ void RenderableStars::loadPSFTexture() {
         std::filesystem::exists(_pointSpreadFunctionTexturePath.value()))
     {
         _pointSpreadFunctionTexture = ghoul::io::TextureReader::ref().loadTexture(
-            absPath(_pointSpreadFunctionTexturePath)
+            absPath(_pointSpreadFunctionTexturePath).string()
         );
 
         if (_pointSpreadFunctionTexture) {
             LDEBUG(fmt::format(
-                "Loaded texture from '{}'",
-                absPath(_pointSpreadFunctionTexturePath)
+                "Loaded texture from '{}'", absPath(_pointSpreadFunctionTexturePath)
             ));
             _pointSpreadFunctionTexture->uploadTexture();
         }
@@ -757,26 +874,16 @@ void RenderableStars::loadPSFTexture() {
         );
 
         _pointSpreadFunctionFile = std::make_unique<ghoul::filesystem::File>(
-            _pointSpreadFunctionTexturePath
-            );
+            _pointSpreadFunctionTexturePath.value()
+        );
         _pointSpreadFunctionFile->setCallback(
-            [&](const ghoul::filesystem::File&) {
-            _pointSpreadFunctionTextureIsDirty = true;
-        }
+            [&]() { _pointSpreadFunctionTextureIsDirty = true; }
         );
     }
     _pointSpreadFunctionTextureIsDirty = false;
-
 }
 
 void RenderableStars::renderPSFToTexture() {
-    // Saves current FBO first
-    // GLint defaultFBO;
-    // defaultFBO = global::renderEngine->openglStateCache().defaultFramebuffer();
-
-//    GLint m_viewport[4];
-//    global::renderEngine.openglStateCache().viewPort(m_viewport);
-
     // Creates the FBO for the calculations
     GLuint psfFBO;
     glGenFramebuffers(1, &psfFBO);
@@ -785,9 +892,7 @@ void RenderableStars::renderPSFToTexture() {
     glDrawBuffers(1, drawBuffers);
 
     glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, _psfTexture, 0);
-
-    glViewport(0, 0, _psfTextureSize, _psfTextureSize);
-
+    glViewport(0, 0, PsfTextureSize, PsfTextureSize);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
     std::unique_ptr<ghoul::opengl::ProgramObject> program =
@@ -798,8 +903,8 @@ void RenderableStars::renderPSFToTexture() {
         );
 
     program->activate();
-    constexpr const float black[] = { 0.f, 0.f, 0.f, 0.f };
-    glClearBufferfv(GL_COLOR, 0, black);
+    constexpr const std::array<float, 4> Black = { 0.f, 0.f, 0.f, 0.f };
+    glClearBufferfv(GL_COLOR, 0, Black.data());
 
     program->setUniform("psfMethod", _psfMethodOption.value());
     program->setUniform("p0Param", _p0Param);
@@ -873,7 +978,7 @@ void RenderableStars::renderPSFToTexture() {
     //    m_viewport[2],
     //    m_viewport[3]
     //);
-    //glDeleteFramebuffers(1, &psfFBO);
+    glDeleteFramebuffers(1, &psfFBO);
     //glDeleteFramebuffers(1, &convolveFBO);
 
     // Restores OpenGL blending state
@@ -881,7 +986,7 @@ void RenderableStars::renderPSFToTexture() {
 }
 
 void RenderableStars::render(const RenderData& data, RendererTasks&) {
-    if (_fullData.empty()) {
+    if (_dataset.entries.empty()) {
         return;
     }
 
@@ -931,7 +1036,7 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
     float fadeInVariable = 1.f;
     if (!_disableFadeInDistance) {
         float distCamera = static_cast<float>(glm::length(data.camera.positionVec3()));
-        const glm::vec2 fadeRange = _fadeInDistance;
+        const glm::vec2 fadeRange = _fadeInDistances;
         const double a = 1.f / ((fadeRange.y - fadeRange.x) * PARSEC);
         const double b = -(fadeRange.x / (fadeRange.y - fadeRange.x));
         const double funcValue = a * distCamera + b;
@@ -981,7 +1086,7 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
 
 
     glBindVertexArray(_vao);
-    const GLsizei nStars = static_cast<GLsizei>(_fullData.size() / _nValuesPerStar);
+    const GLsizei nStars = static_cast<GLsizei>(_dataset.entries.size());
     glDrawArrays(GL_POINTS, 0, nStars);
 
     glBindVertexArray(0);
@@ -999,7 +1104,7 @@ void RenderableStars::update(const UpdateData&) {
         _dataIsDirty = true;
     }
 
-    if (_fullData.empty()) {
+    if (_dataset.entries.empty()) {
         return;
     }
 
@@ -1007,9 +1112,7 @@ void RenderableStars::update(const UpdateData&) {
         const int value = _colorOption;
         LDEBUG("Regenerating data");
 
-        createDataSlice(ColorOption(value));
-
-        int size = static_cast<int>(_slicedData.size());
+        std::vector<float> slice = createDataSlice(ColorOption(value));
 
         if (_vao == 0) {
             glGenVertexArrays(1, &_vao);
@@ -1021,8 +1124,8 @@ void RenderableStars::update(const UpdateData&) {
         glBindBuffer(GL_ARRAY_BUFFER, _vbo);
         glBufferData(
             GL_ARRAY_BUFFER,
-            size * sizeof(GLfloat),
-            _slicedData.data(),
+            slice.size() * sizeof(GLfloat),
+            slice.data(),
             GL_STATIC_DRAW
         );
 
@@ -1032,8 +1135,8 @@ void RenderableStars::update(const UpdateData&) {
             "in_bvLumAbsMagAppMag"
         );
 
-        const size_t nStars = _fullData.size() / _nValuesPerStar;
-        const size_t nValues = _slicedData.size() / nStars;
+        const size_t nStars = _dataset.entries.size();
+        const size_t nValues = slice.size() / nStars;
 
         GLsizei stride = static_cast<GLsizei>(sizeof(GLfloat) * nValues);
 
@@ -1161,7 +1264,7 @@ void RenderableStars::update(const UpdateData&) {
         _colorTexture = nullptr;
         if (_colorTexturePath.value() != "") {
             _colorTexture = ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_colorTexturePath)
+                absPath(_colorTexturePath).string()
             );
             if (_colorTexture) {
                 LDEBUG(fmt::format(
@@ -1172,11 +1275,9 @@ void RenderableStars::update(const UpdateData&) {
             }
 
             _colorTextureFile = std::make_unique<ghoul::filesystem::File>(
-                _colorTexturePath
-            );
-            _colorTextureFile->setCallback(
-                [&](const ghoul::filesystem::File&) { _colorTextureIsDirty = true; }
+                _colorTexturePath.value()
             );
+            _colorTextureFile->setCallback([this]() { _colorTextureIsDirty = true; });
         }
         _colorTextureIsDirty = false;
     }
@@ -1188,7 +1289,7 @@ void RenderableStars::update(const UpdateData&) {
         _otherDataColorMapTexture = nullptr;
         if (!_otherDataColorMapPath.value().empty()) {
             _otherDataColorMapTexture = ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_otherDataColorMapPath)
+                absPath(_otherDataColorMapPath).string()
             );
             if (_otherDataColorMapTexture) {
                 LDEBUG(fmt::format(
@@ -1208,278 +1309,45 @@ void RenderableStars::update(const UpdateData&) {
     }
 }
 
-/*
-void RenderableStars::loadShapeTexture() {
-    if (_shapeTextureIsDirty) {
-        LDEBUG("Reloading Shape Texture");
-        _shapeTexture = nullptr;
-        if (_shapeTexturePath.value() != "") {
-            _shapeTexture = ghoul::io::TextureReader::ref().loadTexture(
-                absPath(_shapeTexturePath)
-            );
-            if (_shapeTexture) {
-                LDEBUG(fmt::format(
-                    "Loaded texture from '{}'",
-                    absPath(_shapeTexturePath)
-                ));
-                _shapeTexture->uploadTexture();
-            }
-
-            _shapeTextureFile = std::make_unique<ghoul::filesystem::File>(
-                _shapeTexturePath
-                );
-            _shapeTextureFile->setCallback(
-                [&](const ghoul::filesystem::File&) { _shapeTextureIsDirty = true; }
-            );
-        }
-        _shapeTextureIsDirty = false;
-    }
-}
-*/
-
 void RenderableStars::loadData() {
-    std::string file = absPath(_speckFile);
-    if (!FileSys.fileExists(file)) {
+    std::filesystem::path file = absPath(_speckFile);
+    if (!std::filesystem::is_regular_file(file)) {
         return;
     }
 
-    std::string cachedFile = FileSys.cacheManager()->cachedFilename(
-        file,
-        ghoul::filesystem::CacheManager::Persistent::Yes
+    _dataset = speck::data::loadFileWithCache(file);
+    if (_dataset.entries.empty()) {
+        return;
+    }
+
+    std::vector<std::string> variableNames;
+    variableNames.reserve(_dataset.variables.size());
+    for (const speck::Dataset::Variable& v : _dataset.variables) {
+        variableNames.push_back(v.name);
+    }
+    _otherDataOption.addOptions(variableNames);
+
+    bool success = _dataset.normalizeVariable("lum");
+    if (!success) {
+        throw ghoul::RuntimeError("Could not find required variable 'luminosity'");
+    }
+}
+
+std::vector<float> RenderableStars::createDataSlice(ColorOption option) {
+    const int bvIdx = std::max(_dataset.index(_dataMapping.bvColor.value()), 0);
+    const int lumIdx = std::max(_dataset.index(_dataMapping.luminance.value()), 0);
+    const int absMagIdx = std::max(
+        _dataset.index(_dataMapping.absoluteMagnitude.value()),
+        0
     );
-
-    _nValuesPerStar = 0;
-    _slicedData.clear();
-    _fullData.clear();
-    _dataNames.clear();
-
-    bool hasCachedFile = FileSys.fileExists(cachedFile);
-    if (hasCachedFile) {
-        LINFO(fmt::format("Cached file '{}' used for Speck file '{}'",
-            cachedFile, file
-        ));
-
-        bool success = loadCachedFile(cachedFile);
-        if (success) {
-            return;
-        }
-        else {
-            FileSys.cacheManager()->removeCacheFile(file);
-            // Intentional fall-through to the 'else' computation to generate the cache
-            // file for the next run
-        }
-    }
-    else {
-        LINFO(fmt::format("Cache for Speck file '{}' not found", file));
-    }
-    LINFO(fmt::format("Loading Speck file '{}'", file));
-
-    readSpeckFile();
-
-    LINFO("Saving cache");
-    saveCachedFile(cachedFile);
-}
-
-void RenderableStars::readSpeckFile() {
-    std::string _file = _speckFile;
-    std::ifstream file(_file);
-    if (!file.good()) {
-        LERROR(fmt::format("Failed to open Speck file '{}'", _file));
-        return;
-    }
-
-    // The beginning of the speck file has a header that either contains comments
-    // (signaled by a preceding '#') or information about the structure of the file
-    // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
-    std::string line;
-    while (true) {
-        std::streampos position = file.tellg();
-        std::getline(file, line, '\n');
-
-        if (line[0] == '#' || line.empty()) {
-            continue;
-        }
-
-        if (line.substr(0, 7) != "datavar" &&
-            line.substr(0, 10) != "texturevar" &&
-            line.substr(0, 7) != "texture")
-        {
-            // we read a line that doesn't belong to the header, so we have to jump back
-            // before the beginning of the current line
-            if (_enableTestGrid) {
-                file.seekg(position - std::streamoff(8));
-            }
-            break;
-        }
-
-        if (line.substr(0, 7) == "datavar") {
-            // datavar lines are structured as follows:
-            // datavar # description
-            // where # is the index of the data variable; so if we repeatedly overwrite
-            // the 'nValues' variable with the latest index, we will end up with the total
-            // number of values (+3 since X Y Z are not counted in the Speck file index)
-            std::stringstream str(line);
-
-            std::string dummy;
-            str >> dummy;
-            str >> _nValuesPerStar;
-
-            std::string name;
-            str >> name;
-            _dataNames.push_back(name);
-
-            // +3 because the position x, y, z
-            if (name == "lum") {
-                _lumArrayPos = _nValuesPerStar + 3;
-            }
-            else if (name == "absmag") {
-                _absMagArrayPos = _nValuesPerStar + 3;
-            }
-            else if (name == "appmag") {
-                _appMagArrayPos = _nValuesPerStar + 3;
-            }
-            else if (name == "colorb_v") {
-                _bvColorArrayPos = _nValuesPerStar + 3;
-            }
-            else if (name == "vx") {
-                _velocityArrayPos = _nValuesPerStar + 3;
-            }
-            else if (name == "speed") {
-                _speedArrayPos = _nValuesPerStar + 3;
-            }
-            _nValuesPerStar += 1; // We want the number, but the index is 0 based
-        }
-    }
-
-    _nValuesPerStar += 3; // X Y Z are not counted in the Speck file indices
-    _otherDataOption.addOptions(_dataNames);
-
-    float minLumValue = std::numeric_limits<float>::max();
-    float maxLumValue = std::numeric_limits<float>::min();
-
-    do {
-        std::vector<float> values(_nValuesPerStar);
-        std::stringstream str(line);
-
-        for (int i = 0; i < _nValuesPerStar; ++i) {
-            str >> values[i];
-        }
-
-        bool nullArray = true;
-        for (float v : values) {
-            if (v != 0.0) {
-                nullArray = false;
-                break;
-            }
-        }
-        minLumValue = values[_lumArrayPos] < minLumValue ?
-            values[_lumArrayPos] : minLumValue;
-        maxLumValue = values[_lumArrayPos] > maxLumValue ?
-            values[_lumArrayPos] : maxLumValue;
-        if (!nullArray) {
-            _fullData.insert(_fullData.end(), values.begin(), values.end());
-        }
-
-        std::getline(file, line, '\n');
-
-    } while (!file.eof());
-
-    // Normalize Luminosity:
-    for (size_t i = 0; i < _fullData.size(); i += _nValuesPerStar) {
-        _fullData[i + _lumArrayPos] =
-            (_fullData[i + _lumArrayPos] - minLumValue) / (maxLumValue - minLumValue);
-    }
-}
-
-bool RenderableStars::loadCachedFile(const std::string& file) {
-    std::ifstream fileStream(file, std::ifstream::binary);
-    if (fileStream.good()) {
-        int8_t version = 0;
-        fileStream.read(reinterpret_cast<char*>(&version), sizeof(int8_t));
-        if (version != CurrentCacheVersion) {
-            LINFO("The format of the cached file has changed: deleting old cache");
-            fileStream.close();
-            FileSys.deleteFile(file);
-            return false;
-        }
-
-        int32_t nValues = 0;
-        fileStream.read(reinterpret_cast<char*>(&nValues), sizeof(int32_t));
-        fileStream.read(reinterpret_cast<char*>(&_nValuesPerStar), sizeof(int32_t));
-
-        fileStream.read(reinterpret_cast<char*>(&_lumArrayPos), sizeof(int32_t));
-        fileStream.read(reinterpret_cast<char*>(&_absMagArrayPos), sizeof(int32_t));
-        fileStream.read(reinterpret_cast<char*>(&_appMagArrayPos), sizeof(int32_t));
-        fileStream.read(reinterpret_cast<char*>(&_bvColorArrayPos), sizeof(int32_t));
-        fileStream.read(reinterpret_cast<char*>(&_velocityArrayPos), sizeof(int32_t));
-        fileStream.read(reinterpret_cast<char*>(&_speedArrayPos), sizeof(int32_t));
-
-        for (int i = 0; i < _nValuesPerStar - 3; ++i) {
-            uint16_t len;
-            fileStream.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
-            std::vector<char> buffer(len);
-            fileStream.read(buffer.data(), len);
-            std::string value(buffer.begin(), buffer.end());
-            _dataNames.push_back(value);
-        }
-        _otherDataOption.addOptions(_dataNames);
-
-        _fullData.resize(nValues);
-        fileStream.read(reinterpret_cast<char*>(
-            _fullData.data()),
-            nValues * sizeof(_fullData[0])
-        );
-
-        bool success = fileStream.good();
-        return success;
-    }
-    else {
-        LERROR(fmt::format("Error opening file '{}' for loading cache file", file));
-        return false;
-    }
-}
-
-void RenderableStars::saveCachedFile(const std::string& file) const {
-    std::ofstream fileStream(file, std::ofstream::binary);
-
-    if (!fileStream.good()) {
-        LERROR(fmt::format("Error opening file '{}' for save cache file", file));
-        return;
-    }
-
-    fileStream.write(
-        reinterpret_cast<const char*>(&CurrentCacheVersion),
-        sizeof(int8_t)
+    const int appMagIdx = std::max(
+        _dataset.index(_dataMapping.apparentMagnitude.value()),
+        0
     );
-
-    int32_t nValues = static_cast<int32_t>(_fullData.size());
-    if (nValues == 0) {
-        throw ghoul::RuntimeError("Error writing cache: No values were loaded");
-    }
-    fileStream.write(reinterpret_cast<const char*>(&nValues), sizeof(int32_t));
-
-    int32_t nValuesPerStar = static_cast<int32_t>(_nValuesPerStar);
-    fileStream.write(reinterpret_cast<const char*>(&nValuesPerStar), sizeof(int32_t));
-    fileStream.write(reinterpret_cast<const char*>(&_lumArrayPos), sizeof(int32_t));
-    fileStream.write(reinterpret_cast<const char*>(&_absMagArrayPos), sizeof(int32_t));
-    fileStream.write(reinterpret_cast<const char*>(&_appMagArrayPos), sizeof(int32_t));
-    fileStream.write(reinterpret_cast<const char*>(&_bvColorArrayPos), sizeof(int32_t));
-    fileStream.write(reinterpret_cast<const char*>(&_velocityArrayPos), sizeof(int32_t));
-    fileStream.write(reinterpret_cast<const char*>(&_speedArrayPos), sizeof(int32_t));
-
-    // -3 as we don't want to save the xyz values that are in the beginning of the file
-    for (int i = 0; i < _nValuesPerStar - 3; ++i) {
-        uint16_t len = static_cast<uint16_t>(_dataNames[i].size());
-        fileStream.write(reinterpret_cast<const char*>(&len), sizeof(uint16_t));
-        fileStream.write(_dataNames[i].c_str(), len);
-    }
-
-    size_t nBytes = nValues * sizeof(_fullData[0]);
-    fileStream.write(reinterpret_cast<const char*>(_fullData.data()), nBytes);
-}
-
-void RenderableStars::createDataSlice(ColorOption option) {
-    _slicedData.clear();
+    const int vxIdx = std::max(_dataset.index(_dataMapping.vx.value()), 0);
+    const int vyIdx = std::max(_dataset.index(_dataMapping.vy.value()), 0);
+    const int vzIdx = std::max(_dataset.index(_dataMapping.vz.value()), 0);
+    const int speedIdx = std::max(_dataset.index(_dataMapping.speed.value()), 0);
 
     _otherDataRange = glm::vec2(
         std::numeric_limits<float>::max(),
@@ -1488,18 +1356,12 @@ void RenderableStars::createDataSlice(ColorOption option) {
 
     double maxRadius = 0.0;
 
-    for (size_t i = 0; i < _fullData.size(); i += _nValuesPerStar) {
-        glm::dvec3 position = glm::dvec3(
-            _fullData[i + 0],
-            _fullData[i + 1],
-            _fullData[i + 2]
-        );
-        position *= openspace::distanceconstants::Parsec;
-
-        const double r = glm::length(position);
-        if (r > maxRadius) {
-            maxRadius = r;
-        }
+    std::vector<float> result;
+    // 7 for the default Color option of 3 positions + bv + lum + abs + app magnitude
+    result.reserve(_dataset.entries.size() * 7);
+    for (const speck::Dataset::Entry& e : _dataset.entries) {
+        glm::dvec3 position = glm::dvec3(e.position) * distanceconstants::Parsec;
+        maxRadius = std::max(maxRadius, glm::length(position));
 
         switch (option) {
             case ColorOption::Color:
@@ -1516,23 +1378,12 @@ void RenderableStars::createDataSlice(ColorOption option) {
                     static_cast<float>(position[2])
                 }};
 
-                if (_enableTestGrid) {
-                    float sunColor = 0.650f;
-                    layout.value.value = sunColor;// _fullData[i + 3];
-                }
-                else {
-                    layout.value.value = _fullData[i + _bvColorArrayPos];
-                }
-
-                layout.value.luminance = _fullData[i + _lumArrayPos];
-                layout.value.absoluteMagnitude = _fullData[i + _absMagArrayPos];
-                layout.value.apparentMagnitude = _fullData[i + _appMagArrayPos];
-
-                _slicedData.insert(
-                    _slicedData.end(),
-                    layout.data.begin(),
-                    layout.data.end());
+                layout.value.value = e.data[bvIdx];
+                layout.value.luminance = e.data[lumIdx];
+                layout.value.absoluteMagnitude = e.data[absMagIdx];
+                layout.value.apparentMagnitude = e.data[appMagIdx];
 
+                result.insert(result.end(), layout.data.begin(), layout.data.end());
                 break;
             }
             case ColorOption::Velocity:
@@ -1548,20 +1399,16 @@ void RenderableStars::createDataSlice(ColorOption option) {
                     static_cast<float>(position[2])
                 }};
 
-                layout.value.value = _fullData[i + _bvColorArrayPos];
-                layout.value.luminance = _fullData[i + _lumArrayPos];
-                layout.value.absoluteMagnitude = _fullData[i + _absMagArrayPos];
-                layout.value.apparentMagnitude = _fullData[i + _appMagArrayPos];
+                layout.value.value = e.data[bvIdx];
+                layout.value.luminance = e.data[lumIdx];
+                layout.value.absoluteMagnitude = e.data[absMagIdx];
+                layout.value.apparentMagnitude = e.data[appMagIdx];
 
-                layout.value.vx = _fullData[i + _velocityArrayPos];
-                layout.value.vy = _fullData[i + _velocityArrayPos + 1];
-                layout.value.vz = _fullData[i + _velocityArrayPos + 2];
+                layout.value.vx = e.data[vxIdx];
+                layout.value.vy = e.data[vyIdx];
+                layout.value.vz = e.data[vzIdx];
 
-                _slicedData.insert(
-                    _slicedData.end(),
-                    layout.data.begin(),
-                    layout.data.end()
-                );
+                result.insert(result.end(), layout.data.begin(), layout.data.end());
                 break;
             }
             case ColorOption::Speed:
@@ -1577,18 +1424,13 @@ void RenderableStars::createDataSlice(ColorOption option) {
                     static_cast<float>(position[2])
                 }};
 
-                layout.value.value = _fullData[i + _bvColorArrayPos];
-                layout.value.luminance = _fullData[i + _lumArrayPos];
-                layout.value.absoluteMagnitude = _fullData[i + _absMagArrayPos];
-                layout.value.apparentMagnitude = _fullData[i + _appMagArrayPos];
+                layout.value.value = e.data[bvIdx];
+                layout.value.luminance = e.data[lumIdx];
+                layout.value.absoluteMagnitude = e.data[absMagIdx];
+                layout.value.apparentMagnitude = e.data[appMagIdx];
+                layout.value.speed = e.data[speedIdx];
 
-                layout.value.speed = _fullData[i + _speedArrayPos];
-
-                _slicedData.insert(
-                    _slicedData.end(),
-                    layout.data.begin(),
-                    layout.data.end()
-                );
+                result.insert(result.end(), layout.data.begin(), layout.data.end());
                 break;
             }
             case ColorOption::OtherData:
@@ -1606,37 +1448,32 @@ void RenderableStars::createDataSlice(ColorOption option) {
 
                 int index = _otherDataOption.value();
                 // plus 3 because of the position
-                layout.value.value = _fullData[i + index + 3];
+                layout.value.value = e.data[index];
 
-                if (_staticFilterValue.has_value() &&
-                    layout.value.value == _staticFilterValue)
+                if (_staticFilterValue.has_value() && e.data[index] == _staticFilterValue)
                 {
                     layout.value.value = _staticFilterReplacementValue;
                 }
 
-                glm::vec2 range = _otherDataRange.value();
+                glm::vec2 range = _otherDataRange;
                 range.x = std::min(range.x, layout.value.value);
                 range.y = std::max(range.y, layout.value.value);
                 _otherDataRange = range;
                 _otherDataRange.setMinValue(glm::vec2(range.x));
                 _otherDataRange.setMaxValue(glm::vec2(range.y));
 
-                layout.value.luminance = _fullData[i + _lumArrayPos];
-                layout.value.absoluteMagnitude = _fullData[i + _absMagArrayPos];
-                layout.value.apparentMagnitude = _fullData[i + _appMagArrayPos];
-
-                _slicedData.insert(
-                    _slicedData.end(),
-                    layout.data.begin(),
-                    layout.data.end()
-                );
+                layout.value.luminance = e.data[lumIdx];
+                layout.value.absoluteMagnitude = e.data[absMagIdx];
+                layout.value.apparentMagnitude = e.data[appMagIdx];
 
+                result.insert(result.end(), layout.data.begin(), layout.data.end());
                 break;
             }
         }
     }
 
     setBoundingSphere(maxRadius);
+    return result;
 }
 
 } // namespace openspace
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index 7f1e83eb02..bb2af31f34 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -27,6 +27,7 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <modules/space/speckloader.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
@@ -74,15 +75,8 @@ private:
         FixedColor = 4
     };
 
-    static const int _psfTextureSize = 64;
-    static const int _convolvedfTextureSize = 257;
-
-    void createDataSlice(ColorOption option);
-
     void loadData();
-    void readSpeckFile();
-    bool loadCachedFile(const std::string& file);
-    void saveCachedFile(const std::string& file) const;
+    std::vector<float> createDataSlice(ColorOption option);
 
     properties::StringProperty _speckFile;
 
@@ -90,9 +84,17 @@ private:
     std::unique_ptr<ghoul::opengl::Texture> _colorTexture;
     std::unique_ptr<ghoul::filesystem::File> _colorTextureFile;
 
-    //properties::StringProperty _shapeTexturePath;
-    //std::unique_ptr<ghoul::opengl::Texture> _shapeTexture;
-    //std::unique_ptr<ghoul::filesystem::File> _shapeTextureFile;
+    properties::PropertyOwner _dataMappingContainer;
+    struct {
+        properties::StringProperty bvColor;
+        properties::StringProperty luminance;
+        properties::StringProperty absoluteMagnitude;
+        properties::StringProperty apparentMagnitude;
+        properties::StringProperty vx;
+        properties::StringProperty vy;
+        properties::StringProperty vz;
+        properties::StringProperty speed;
+    } _dataMapping;
 
     properties::OptionProperty _colorOption;
     properties::OptionProperty _otherDataOption;
@@ -123,16 +125,15 @@ private:
     properties::PropertyOwner _userProvidedTextureOwner;
     properties::PropertyOwner _parametersOwner;
     properties::PropertyOwner _moffatMethodOwner;
-    properties::Vec2Property _fadeInDistance;
+    properties::Vec2Property _fadeInDistances;
     properties::BoolProperty _disableFadeInDistance;
 
     std::unique_ptr<ghoul::opengl::ProgramObject> _program;
     UniformCache(
-        modelMatrix, cameraUp, cameraViewProjectionMatrix,
-        colorOption, magnitudeExponent, eyePosition, psfParamConf,
-        lumCent, radiusCent, brightnessCent, colorTexture,
-        alphaValue, psfTexture, otherDataTexture, otherDataRange,
-        filterOutOfRange, fixedColor
+        modelMatrix, cameraUp, cameraViewProjectionMatrix, colorOption, magnitudeExponent,
+        eyePosition, psfParamConf, lumCent, radiusCent, brightnessCent, colorTexture,
+        alphaValue, psfTexture, otherDataTexture, otherDataRange, filterOutOfRange,
+        fixedColor
     ) _uniformCache;
 
     bool _speckFileIsDirty = true;
@@ -142,26 +143,13 @@ private:
     bool _dataIsDirty = true;
     bool _otherDataColorMapIsDirty = true;
 
-    // Test Grid Enabled
-    bool _enableTestGrid = false;
+    speck::Dataset _dataset;
 
-    std::vector<float> _slicedData;
-    std::vector<float> _fullData;
-
-    int _nValuesPerStar = 0;
     std::string _queuedOtherData;
-    std::vector<std::string> _dataNames;
 
     std::optional<float> _staticFilterValue;
     float _staticFilterReplacementValue = 0.f;
 
-    std::size_t _lumArrayPos = 0;
-    std::size_t _absMagArrayPos = 0;
-    std::size_t _appMagArrayPos = 0;
-    std::size_t _bvColorArrayPos = 0;
-    std::size_t _velocityArrayPos = 0;
-    std::size_t _speedArrayPos = 0;
-
     GLuint _vao = 0;
     GLuint _vbo = 0;
     GLuint _psfVao = 0;
diff --git a/modules/space/rendering/simplespheregeometry.cpp b/modules/space/rendering/simplespheregeometry.cpp
index 5c4ed12ef9..eb95f5153c 100644
--- a/modules/space/rendering/simplespheregeometry.cpp
+++ b/modules/space/rendering/simplespheregeometry.cpp
@@ -55,9 +55,7 @@ namespace {
 namespace openspace::planetgeometry {
 
 documentation::Documentation SimpleSphereGeometry::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_geometry_simplesphere";
-    return doc;
+    return codegen::doc<Parameters>("space_geometry_simplesphere");
 }
 
 SimpleSphereGeometry::SimpleSphereGeometry(const ghoul::Dictionary& dictionary)
diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index 927c1c7ceb..dad12653d2 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -52,6 +52,13 @@ namespace {
         "The time frame in which the spice kernels are valid."
     };
 
+    constexpr openspace::properties::Property::PropertyInfo FixedDateInfo = {
+        "FixedDate",
+        "Fixed Date",
+        "A time to lock the rotation to. Setting this to an empty string will "
+        "unlock the time and return to rotation based on current simulation time."
+    };
+
     struct [[codegen::Dictionary(SpiceRotation)]] Parameters {
         // [[codegen::verbatim(SourceInfo.description)]]
         std::string sourceFrame
@@ -66,6 +73,10 @@ namespace {
         // [[codegen::verbatim(TimeFrameInfo.description)]]
         std::optional<ghoul::Dictionary> timeFrame
             [[codegen::reference("core_time_frame")]];
+
+        // [[codegen::verbatim(FixedDateInfo.description)]]
+        std::optional<std::string> fixedDate
+            [[codegen::annotation("A time to lock the rotation to")]];
     };
 #include "spicerotation_codegen.cpp"
 } // namespace
@@ -73,14 +84,13 @@ namespace {
 namespace openspace {
 
 documentation::Documentation SpiceRotation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_transform_rotation_spice";
-    return doc;
+    return codegen::doc<Parameters>("space_transform_rotation_spice");
 }
 
 SpiceRotation::SpiceRotation(const ghoul::Dictionary& dictionary)
     : _sourceFrame(SourceInfo)
     , _destinationFrame(DestinationInfo)
+    , _fixedDate(FixedDateInfo)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
@@ -98,6 +108,17 @@ SpiceRotation::SpiceRotation(const ghoul::Dictionary& dictionary)
         }
     }
 
+    _fixedDate.onChange([this]() {
+        if (_fixedDate.value().empty()) {
+            _fixedEphemerisTime = std::nullopt;
+        }
+        else {
+            _fixedEphemerisTime = SpiceManager::ref().ephemerisTimeFromDate(_fixedDate);
+        }
+    });
+    _fixedDate = p.fixedDate.value_or(_fixedDate);
+    addProperty(_fixedDate);
+
     if (dictionary.hasKey(TimeFrameInfo.identifier)) {
         ghoul::Dictionary timeFrameDictionary =
             dictionary.value<ghoul::Dictionary>(TimeFrameInfo.identifier);
@@ -113,16 +134,21 @@ SpiceRotation::SpiceRotation(const ghoul::Dictionary& dictionary)
 
     _sourceFrame.onChange([this]() { requireUpdate(); });
     _destinationFrame.onChange([this]() { requireUpdate(); });
+
 }
 
 glm::dmat3 SpiceRotation::matrix(const UpdateData& data) const {
     if (_timeFrame && !_timeFrame->isActive(data.time)) {
         return glm::dmat3(1.0);
     }
+    double time = data.time.j2000Seconds();
+    if (_fixedEphemerisTime.has_value()) {
+        time = *_fixedEphemerisTime;
+    }
     return SpiceManager::ref().positionTransformMatrix(
         _sourceFrame,
         _destinationFrame,
-        data.time.j2000Seconds()
+        time
     );
 }
 
diff --git a/modules/space/rotation/spicerotation.h b/modules/space/rotation/spicerotation.h
index 1cc4043774..af819b9606 100644
--- a/modules/space/rotation/spicerotation.h
+++ b/modules/space/rotation/spicerotation.h
@@ -29,6 +29,7 @@
 
 #include <openspace/properties/stringproperty.h>
 #include <openspace/scene/timeframe.h>
+#include <optional>
 
 namespace openspace {
 
@@ -46,7 +47,10 @@ public:
 private:
     properties::StringProperty _sourceFrame;
     properties::StringProperty _destinationFrame;
+    properties::StringProperty _fixedDate;
+
     ghoul::mm_unique_ptr<TimeFrame> _timeFrame;
+    std::optional<double> _fixedEphemerisTime;
 };
 
 } // namespace openspace
diff --git a/modules/space/shaders/constellationbounds_fs.glsl b/modules/space/shaders/constellationbounds_fs.glsl
index 32ea62a82e..5e0f05b820 100644
--- a/modules/space/shaders/constellationbounds_fs.glsl
+++ b/modules/space/shaders/constellationbounds_fs.glsl
@@ -27,16 +27,14 @@
 
 in vec4 vs_position;
 
-uniform vec4 campos;
-uniform vec4 objpos;
 uniform vec3 color;
 
 Fragment getFragment() {
-    vec4 position = vs_position;
+  vec4 position = vs_position;
     
-    Fragment frag;
-    frag.color = vec4(color, 1.0);
-    frag.depth = pscDepth(position);
+  Fragment frag;
+  frag.color = vec4(color, 1.0);
+  frag.depth = pscDepth(position);
 
-    return frag;
+  return frag;
 }
diff --git a/modules/space/shaders/constellationbounds_vs.glsl b/modules/space/shaders/constellationbounds_vs.glsl
index 1f3bc5245e..12c74b2476 100644
--- a/modules/space/shaders/constellationbounds_vs.glsl
+++ b/modules/space/shaders/constellationbounds_vs.glsl
@@ -33,11 +33,11 @@ uniform mat4 ModelTransform;
 #include "PowerScaling/powerScaling_vs.hglsl"
 
 void main() {
-    vec4 tmp = vec4(in_position, 0.0);
-    vs_position = tmp;
+  vec4 tmp = vec4(in_position, 0.0);
+  vs_position = tmp;
 
-    vec4 position = pscTransform(tmp, ModelTransform);
-    vs_position = tmp;
-    position = ViewProjection * position;
-    gl_Position =  z_normalization(position);
+  vec4 position = pscTransform(tmp, ModelTransform);
+  vs_position = tmp;
+  position = ViewProjection * position;
+  gl_Position =  z_normalization(position);
 }
diff --git a/modules/space/shaders/convolution_fs.glsl b/modules/space/shaders/convolution_fs.glsl
index c884ce1846..cea22697c0 100644
--- a/modules/space/shaders/convolution_fs.glsl
+++ b/modules/space/shaders/convolution_fs.glsl
@@ -26,8 +26,7 @@
 
 out vec4 renderTableColor;
 
-in vec2 psfCoords;
-in vec2 texturesCoords;
+in vec2 vs_uv;
 
 uniform int psfTextureSize;
 uniform int convolvedfTextureSize;
@@ -35,42 +34,19 @@ uniform sampler2D psfTexture;
 uniform sampler2D shapeTexture;
 
 void main() {
-    float fullColor = 0.0;
-    
-    // Kernel Center
-    //vec2 psfTextureCoords = vec2((float(psfTextureSize)/2.0 + 1.0) / float(psfTextureSize));
-    // fullColor += texture2D(shapeTexture, texturesCoords) * 
-    //             texture2D(psfTexture, psfTextureCoords);
-
-    float maxConvSize = float(psfTextureSize);
-    float convStep = 1.0 / maxConvSize;
-    float textureStep = 1.0 / float(convolvedfTextureSize);
-    for (float i = 0.0, ii = 0.0; i < maxConvSize; i += convStep, ii += textureStep) {
-        for (float j = 0.0, jj = 0.0; j < maxConvSize; j += convStep, jj += textureStep) {
-            vec2 newTexCoords = texturesCoords;
-            newTexCoords.x = i < 0.5 ? texturesCoords.x - ii : texturesCoords.x + ii;
-            newTexCoords.y = j < 0.5 ? texturesCoords.y - jj : texturesCoords.y + jj;
-            newTexCoords.x = newTexCoords.x > 1.0 ? 1.0 : newTexCoords.x < 0.0 ? 0.0 : newTexCoords.x;
-            newTexCoords.y = newTexCoords.y > 1.0 ? 1.0 : newTexCoords.y < 0.0 ? 0.0 : newTexCoords.y;
-            fullColor += texture2D(shapeTexture, newTexCoords).x * 
-                texture2D(psfTexture, vec2(i, j)).x;
-        }
+  float fullColor = 0.0;
+  
+  float maxConvSize = float(psfTextureSize);
+  float convStep = 1.0 / maxConvSize;
+  float textureStep = 1.0 / float(convolvedfTextureSize);
+  for (float i = 0.0, ii = 0.0; i < maxConvSize; i += convStep, ii += textureStep) {
+    for (float j = 0.0, jj = 0.0; j < maxConvSize; j += convStep, jj += textureStep) {
+      vec2 uv = vs_uv;
+      uv.x = clamp(i < 0.5 ? vs_uv.x - ii : vs_uv.x + ii, 0.0, 1.0);
+      uv.y = clamp(j < 0.5 ? vs_uv.y - jj : vs_uv.y + jj, 0.0, 1.0);
+      fullColor += texture(shapeTexture, uv).x * texture(psfTexture, vec2(i, j)).x;
     }
+  }
 
-    /*
-     vec2 onePixel = vec2(1.0, 1.0) /  float(psfTextureSize);
-    vec4 fullColor =
-     texture2D(shapeTexture, texturesCoords + onePixel * vec2(-1, -1)) * texture2D(psfTexture, vec2(i, j)) +
-     texture2D(shapeTexture, texturesCoords + onePixel * vec2( 0, -1)) * texture2D(psfTexture, vec2(i, j)) +
-     texture2D(shapeTexture, texturesCoords + onePixel * vec2( 1, -1)) * texture2D(psfTexture, vec2(i, j)) +
-     texture2D(shapeTexture, texturesCoords + onePixel * vec2(-1,  0)) * texture2D(psfTexture, vec2(i, j)) +
-     texture2D(shapeTexture, texturesCoords + onePixel * vec2( 0,  0)) * texture2D(psfTexture, vec2(i, j)) +
-     texture2D(shapeTexture, texturesCoords + onePixel * vec2( 1,  0)) * texture2D(psfTexture, vec2(i, j)) +
-     texture2D(shapeTexture, texturesCoords + onePixel * vec2(-1,  1)) * texture2D(psfTexture, vec2(i, j)) +
-     texture2D(shapeTexture, texturesCoords + onePixel * vec2( 0,  1)) * texture2D(psfTexture, vec2(i, j)) +
-     texture2D(shapeTexture, texturesCoords + onePixel * vec2( 1,  1)) * texture2D(psfTexture, vec2(i, j));
-     */
-
-
-    renderTableColor = vec4(fullColor/40.0);
+  renderTableColor = vec4(fullColor / 40.0);
 }
diff --git a/modules/space/shaders/convolution_vs.glsl b/modules/space/shaders/convolution_vs.glsl
index a92bf82d5d..d3cb844fbe 100644
--- a/modules/space/shaders/convolution_vs.glsl
+++ b/modules/space/shaders/convolution_vs.glsl
@@ -26,11 +26,9 @@
 
 layout(location = 0) in vec4 in_position;
 
-out vec2 psfCoords;
-out vec2 texturesCoords;
+out vec2 vs_uv;
 
 void main() {
-    gl_Position = vec4(in_position.xy, 0.f, 1.f);
-    psfCoords = vec2(in_position);
-    texturesCoords = vec2(in_position.zw);
+  gl_Position = vec4(in_position.xy, 0.0, 1.0);
+  vs_uv = vec2(in_position.zw);
 }
diff --git a/modules/space/shaders/debrisViz_fs.glsl b/modules/space/shaders/debrisViz_fs.glsl
index b7a8476e81..239894d9ea 100644
--- a/modules/space/shaders/debrisViz_fs.glsl
+++ b/modules/space/shaders/debrisViz_fs.glsl
@@ -23,77 +23,52 @@
  ****************************************************************************************/
 
 #include "fragment.glsl"
-//#include "floatoperations.glsl"
+
+in vec4 viewSpacePosition;
+in float viewSpaceDepth;
+in float periodFraction;
+in float offsetPeriods;
 
 uniform vec3 color;
 uniform float opacity = 1.0;
-
 uniform float lineFade;
-// uniform int numberOfSegments;
 
-
-in vec4 viewSpacePosition;
-in float vs_position_w;
-
-in float periodFraction_f;
-in float offsetPeriods;
-in float vertexID_f;
-
-// debuggers :
-// in float offset;
-// in float epoch;
-// in float period;
-// in flat double tajm;
 Fragment getFragment() {
-    // float offsetPeriods = offset / period;
-    // This is now done in the fragment shader instead
-    // to make smooth movement between vertecies.
-    // We want vertexDistance to be double up to this point, I think. 
-    // (hence the unnessesary float to float conversion)
-    float vertexDistance = periodFraction_f - offsetPeriods;
-    float vertexDistance_f = float(vertexDistance);
-    
-    // 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_f - (vertexID_perOrbit/nrOfSegments_f); 
+  // float offsetPeriods = offset / period;
+  // This is now done in the fragment shader instead to make smooth movement between
+  // vertices. We want vertexDistance to be double up to this point, I think, (hence the
+  // unnessesary float to float conversion)
+  float vertexDistance = periodFraction - offsetPeriods;
+  
+  // 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); 
 
-    if (vertexDistance_f < 0.0) {
-        vertexDistance_f += 1.0;
-    }
+  if (vertexDistance < 0.0) {
+    vertexDistance += 1.0;
+  }
 
-    float invert = pow((1.0 - vertexDistance_f), lineFade);
-    float fade = clamp(invert, 0.0, 1.0);
+  float invert = pow((1.0 - vertexDistance), lineFade);
+  float fade = clamp(invert, 0.0, 1.0);
 
-    // Currently even fully transparent lines can occlude other lines, thus we discard
-    // these fragments since debris and satellites are rendered so close to each other
-    if (fade < 0.05) {
-        discard;
-    }
-    Fragment frag;
+  // Currently even fully transparent lines can occlude other lines, thus we discard these
+  // fragments since debris and satellites are rendered so close to each other
+  if (fade < 0.05) {
+    discard;
+  }
 
+  Fragment frag;
+  if (fade < 0.15) {
     // Use additive blending for some values to make the discarding less abrupt
-    if (fade < 0.15) {
-        frag.blend = BLEND_MODE_ADDITIVE;
-    }
+    frag.blend = BLEND_MODE_ADDITIVE;
+  }
 
-    frag.color = vec4(color, fade * opacity);
-    frag.depth = vs_position_w;
-    frag.gPosition = viewSpacePosition;
-    frag.gNormal = vec4(1, 1, 1, 0);
+  frag.color = vec4(color, fade * opacity);
+  frag.depth = viewSpaceDepth;
+  frag.gPosition = viewSpacePosition;
+  frag.gNormal = vec4(1.0, 1.0, 1.0, 0.0);
 
-
-    // to debug using colors use this if-statment.
-    // float ep = 0.01;
-    // if (fract(vertexID_f) < ep) {
-    //     periodFraction < ep
-    //     frag.color = vec4(1, 0, 0, 1);
-    // }
-
-    return frag;
+  return frag;
 }
-
-
-
-
diff --git a/modules/space/shaders/debrisViz_vs.glsl b/modules/space/shaders/debrisViz_vs.glsl
index 7ec4e86faf..460e8f6e87 100644
--- a/modules/space/shaders/debrisViz_vs.glsl
+++ b/modules/space/shaders/debrisViz_vs.glsl
@@ -26,68 +26,47 @@
 
 #include "PowerScaling/powerScalingMath.hglsl"
 
-layout (location = 0) in vec4 vertex_data; // 1: x, 2: y, 3: z, 4: timeOffset, 
-layout (location = 1) in vec2 orbit_data; // 1: epoch, 2: period
+layout (location = 0) in vec4 vertexData; // 1: x, 2: y, 3: z, 4: timeOffset, 
+layout (location = 1) in vec2 orbitData; // 1: epoch, 2: period
+
+out vec4 viewSpacePosition;
+out float viewSpaceDepth;
+out float periodFraction;
+out float offsetPeriods;
 
 uniform dmat4 modelViewTransform;
 uniform mat4 projectionTransform;
-
-//uniform float lineFade;
 uniform double inGameTime;
 
-out vec4 viewSpacePosition;
-out float vs_position_w;
-
-out float periodFraction_f;
-out float offsetPeriods;
-out float vertexID_f;
-
-// debugers :
-// out float offset;
-// out float epoch;
-// out float period;
-// out double tajm;
-
 void main() {
-    // tajm = inGameTime;
-    /** The way the position and line fade is calculated is:
-    *   By using inGameTime, epoch and period of this orbit, 
-    *   we get how many revolutions it has done since epoch.
-    *   The fract of that, is how far into a revolution it has traveld since epoch.
-    *   Similarly we do the same but for this vertex, but calculating offsetPeriods.
-    *   In the fragment shader the difference between 
-    *   periodFraction_f and offsetPeriods is calculated to know how much to fade
-    *   that specific fragment.
-    */
+  /*
+   * The way the position and line fade is calculated is:
+   * By using inGameTime, epoch and period of this orbit, we get how many revolutions it
+   * has done since epoch. The fract of that, is how far into a revolution it has traveled
+   * since epoch. Similarly we do the same but for this vertex, but calculating
+   * offsetPeriods. In the fragment shader the difference between periodFraction_f and
+   * offsetPeriods is calculated to know how much to fade that specific fragment.
+   */
 
-    // If orbit_data is doubles, cast to float first
-    float offset = vertex_data.w;
-    double epoch = orbit_data.x;
-    double period = orbit_data.y;
-  
-    // calculate nr of periods, get fractional part to know where
-    // the vertex closest to the debris part is right now
-    double nrOfRevolutions = (inGameTime - epoch) / period;
-    //double periodFraction = fract(nrOfRevolutions); //mod(nrOfRevolutions, 1.0);
-    int intfrac = int(nrOfRevolutions);
-    double doublefrac = double(intfrac);
-    double periodFraction = nrOfRevolutions - doublefrac;
-    if (periodFraction < 0.0) {
-        periodFraction += 1.0;
-    }
-    periodFraction_f = float(periodFraction);
+  // If orbit_data is doubles, cast to float first
+  float epoch = orbitData.x;
+  float period = orbitData.y;
 
-    // same procedure for the current vertex
-    float period_f = float(period);
-    offsetPeriods = offset / period_f;
+  // calculate nr of periods, get fractional part to know where the vertex closest to the
+  // debris part is right now
+  double nrOfRevolutions = (inGameTime - epoch) / period;
+  double frac = double(int(nrOfRevolutions));
+  double periodFractiond = nrOfRevolutions - frac;
+  if (periodFractiond < 0.0) {
+    periodFractiond += 1.0;
+  }
+  periodFraction = float(periodFractiond);
 
-    // offsetPeriods can also be calculated by passing the vertexID as a float
-    // to the fragment shader and deviding it by nrOfSegments.
-    vertexID_f = float(gl_VertexID);
-    dvec3 positions = dvec3(vertex_data.x, vertex_data.y, vertex_data.z); 
-    dvec4 vertexPosition = dvec4(positions, 1);
-    viewSpacePosition = vec4(modelViewTransform * vertexPosition);
-    vec4 vs_position = z_normalization( projectionTransform * viewSpacePosition);
-    gl_Position = vs_position;
-    vs_position_w = vs_position.w;
+  // same procedure for the current vertex
+  offsetPeriods = vertexData.w / float(period);
+
+  viewSpacePosition = vec4(modelViewTransform * dvec4(vertexData.xyz, 1));
+  vec4 vs_position = z_normalization(projectionTransform * viewSpacePosition);
+  gl_Position = vs_position;
+  viewSpaceDepth = vs_position.w;
 }
diff --git a/modules/space/shaders/habitablezone_fs.glsl b/modules/space/shaders/habitablezone_fs.glsl
index 11bcca4f3b..565a0f8379 100644
--- a/modules/space/shaders/habitablezone_fs.glsl
+++ b/modules/space/shaders/habitablezone_fs.glsl
@@ -40,48 +40,48 @@ uniform bool showOptimistic;
 float computeTextureCoord(float radius, float innerRadius,
                           float conservativeInner, float conservativeOuter)
 {
-    const float t1 = 1.0 / 3.0;
-    const float t2 = 2.0 / 3.0;
+  const float t1 = 1.0 / 3.0;
+  const float t2 = 2.0 / 3.0;
 
-    if (radius < conservativeInner) {
-        float t = (radius - innerRadius) / (conservativeInner - innerRadius);
-        return mix(0.0, t1, t);
-    }
-    else if (radius > conservativeOuter) {
-        float t = (radius - conservativeOuter) / (1.0 - conservativeOuter);
-        return mix(t2, 1.0, t);
-    }
-    else {
-        float t = (radius - conservativeInner) / (conservativeOuter - conservativeInner);
-        return mix(t1, t2, t);
-    }
+  if (radius < conservativeInner) {
+    float t = (radius - innerRadius) / (conservativeInner - innerRadius);
+    return mix(0.0, t1, t);
+  }
+  else if (radius > conservativeOuter) {
+    float t = (radius - conservativeOuter) / (1.0 - conservativeOuter);
+    return mix(t2, 1.0, t);
+  }
+  else {
+    float t = (radius - conservativeInner) / (conservativeOuter - conservativeInner);
+    return mix(t1, t2, t);
+  }
 }
 
 Fragment getFragment() {
-    // The length of the texture coordinates vector is our distance from the center
-    float radius = length(vs_st);
-    float innerRadius = 1.0 - width;
+  // The length of the texture coordinates vector is our distance from the center
+  float radius = length(vs_st);
+  float innerRadius = 1.0 - width;
 
-    // We only want to consider ring-like objects so we need to discard everything else
-    if (radius > 1.0 || radius < innerRadius) {
-        discard;
-    }
+  // We only want to consider ring-like objects so we need to discard everything else
+  if (radius > 1.0 || radius < innerRadius) {
+    discard;
+  }
 
-    float consInner = conservativeBounds.x;
-    float consOuter = conservativeBounds.y;
-    bool outsideConservative = (radius < consInner) || (radius > consOuter);
+  float consInner = conservativeBounds.x;
+  float consOuter = conservativeBounds.y;
+  bool outsideConservative = (radius < consInner) || (radius > consOuter);
 
-    if (!showOptimistic && outsideConservative) {
-        discard;
-    }
+  if (!showOptimistic && outsideConservative) {
+    discard;
+  }
 
-    float texCoord = computeTextureCoord(radius, innerRadius, consInner, consOuter);
+  float texCoord = computeTextureCoord(radius, innerRadius, consInner, consOuter);
 
-    vec4 diffuse = texture(transferFunctionTexture, texCoord);
-    diffuse.a *= opacity;
+  vec4 diffuse = texture(transferFunctionTexture, texCoord);
+  diffuse.a *= opacity;
 
-    Fragment frag;
-    frag.color = diffuse;
-    frag.depth = vs_screenSpaceDepth;
-    return frag;
+  Fragment frag;
+  frag.color = diffuse;
+  frag.depth = vs_screenSpaceDepth;
+  return frag;
 }
diff --git a/modules/space/shaders/habitablezone_vs.glsl b/modules/space/shaders/habitablezone_vs.glsl
index d5796d62d9..599b4a2a8a 100644
--- a/modules/space/shaders/habitablezone_vs.glsl
+++ b/modules/space/shaders/habitablezone_vs.glsl
@@ -35,13 +35,13 @@ out float vs_screenSpaceDepth;
 uniform mat4 modelViewProjectionTransform;
 
 void main() {
-    vec4 position = vec4(in_position.xy, 0.0, 1.0);
-    vec4 positionScreenSpace = z_normalization(modelViewProjectionTransform * position);
+  vec4 position = vec4(in_position.xy, 0.0, 1.0);
+  vec4 positionScreenSpace = z_normalization(modelViewProjectionTransform * position);
 
-    // Moving the origin to the center
-    vs_st = (in_st - vec2(0.5)) * 2.0;
+  // Moving the origin to the center
+  vs_st = (in_st - vec2(0.5)) * 2.0;
 
-    vs_screenSpaceDepth = positionScreenSpace.w;
+  vs_screenSpaceDepth = positionScreenSpace.w;
 
-    gl_Position = positionScreenSpace;
+  gl_Position = positionScreenSpace;
 }
diff --git a/modules/space/shaders/psfToTexture_fs.glsl b/modules/space/shaders/psfToTexture_fs.glsl
index 288149d9b2..b4cba15cb2 100644
--- a/modules/space/shaders/psfToTexture_fs.glsl
+++ b/modules/space/shaders/psfToTexture_fs.glsl
@@ -24,7 +24,6 @@
 
 #version __CONTEXT__
 
-//layout(location = 1) out vec4 renderTableColor;
 out vec4 renderTableColor;
 
 uniform int psfMethod;
@@ -39,30 +38,32 @@ uniform float betaConstant;
 
 in vec2 psfCoords;
 
+const int PsfMethodSpencer = 0;
+const int PsfMethodMoffat = 1;
+
 void main() {
-    vec4 fullColor = vec4(0.0, 0.0, 0.0, 1.0);
-    if (psfMethod == 0) { 
-        // 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;
-        float f0  = 2.61E6 * exp(-pow(theta/alphaConst, 2.0));
-        float f1  = 20.91/pow(theta + alphaConst, 3.0);
-        float f2  = 72.37/pow(theta + alphaConst, 2.0);
-        float psf_p = p0Param * f0 + p1Param * f1 + p2Param * f2;
-        fullColor = vec4(psf_p);
-    }
-    else if (psfMethod == 1) {
-        // Moffat
-        float r = sqrt((psfCoords.y*psfCoords.y + psfCoords.x*psfCoords.x)) * 90.0;
-        float alpha = FWHM / (2.f * sqrt(pow(2.f, 1.f/betaConstant) - 1));
-        float moffat_psf = pow(1.f + (r/alpha)*(r/alpha), -betaConstant);
-        
-        fullColor = vec4(moffat_psf);
-    }
-    
-    if (fullColor.a == 0) {
-        discard;
-    }
-    
-    renderTableColor = fullColor;
+  vec4 fullColor = vec4(0.0, 0.0, 0.0, 1.0);
+  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;
+    float f0 = 2.61E6 * exp(-pow(theta / alphaConst, 2.0));
+    float f1 = 20.91 / pow(theta + alphaConst, 3.0);
+    float f2 = 72.37 / pow(theta + alphaConst, 2.0);
+    float spencer = p0Param * f0 + p1Param * f1 + p2Param * f2;
+    fullColor = vec4(spencer);
+}
+  else if (psfMethod == PsfMethodMoffat) {
+    // Moffat
+    float r = sqrt((psfCoords.y * psfCoords.y + psfCoords.x * psfCoords.x)) * 90.0;
+    float alpha = FWHM / (2.0 * sqrt(pow(2.0, 1.0 / betaConstant) - 1.0));
+    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/psfToTexture_vs.glsl b/modules/space/shaders/psfToTexture_vs.glsl
index 03ae1f2ef5..e460cf80b8 100644
--- a/modules/space/shaders/psfToTexture_vs.glsl
+++ b/modules/space/shaders/psfToTexture_vs.glsl
@@ -29,6 +29,6 @@ layout(location = 0) in vec4 in_position;
 out vec2 psfCoords;
 
 void main() {
-    gl_Position = vec4(in_position.xy, 0.f, 1.f);
-    psfCoords = vec2(in_position);
+  gl_Position = vec4(in_position.xy, 0.0, 1.0);
+  psfCoords = vec2(in_position);
 }
diff --git a/modules/space/shaders/rings_fs.glsl b/modules/space/shaders/rings_fs.glsl
index 76c92cb733..b5fa7f35a2 100644
--- a/modules/space/shaders/rings_fs.glsl
+++ b/modules/space/shaders/rings_fs.glsl
@@ -38,61 +38,62 @@ uniform bool hasSunPosition;
 uniform vec3 sunPosition;
 uniform float _nightFactor;
 
-
 Fragment getFragment() {
-    // Moving the origin to the center
-    vec2 st = (vs_st - vec2(0.5)) * 2.0;
+  // Moving the origin to the center
+  vec2 st = (vs_st - vec2(0.5)) * 2.0;
 
-    // The length of the texture coordinates vector is our distance from the center
-    float radius = length(st);
+  // The length of the texture coordinates vector is our distance from the center
+  float radius = length(st);
 
-    // We only want to consider ring-like objects so we need to discard everything else
-    if (radius > 1.0)
-        discard;
+  // We only want to consider ring-like objects so we need to discard everything else
+  if (radius > 1.0) {
+    discard;
+  }
 
-    // Remapping the texture coordinates
-    // Radius \in [0,1],  texCoord \in [textureOffset.x, textureOffset.y]
-    // textureOffset.x -> 0
-    // textureOffset.y -> 1
-    float texCoord = (radius - textureOffset.x) / (textureOffset.y - textureOffset.x);
-    if (texCoord < 0.f || texCoord > 1.f) {
-        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]
-    float colorValue = length(diffuse.rgb) / 3.0;
-    if (colorValue < colorFilterValue) {
-        diffuse.a = colorValue * colorFilterValue;
-        if (diffuse.a < 0.65)
-            discard;
+  // Remapping the texture coordinates
+  // Radius \in [0,1],  texCoord \in [textureOffset.x, textureOffset.y]
+  // textureOffset.x -> 0
+  // textureOffset.y -> 1
+  float texCoord = (radius - textureOffset.x) / (textureOffset.y - textureOffset.x);
+  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]
+  float colorValue = length(diffuse.rgb) / 3.0;
+  if (colorValue < colorFilterValue) {
+    diffuse.a = colorValue * colorFilterValue;
+    if (diffuse.a < 0.65) {
+      discard;
     }
+  }
 
-    // The normal for the one plane depends on whether we are dealing
-    // with a front facing or back facing fragment
-    vec3 normal;
-    // The plane is oriented on the xz plane
-    // WARNING: This might not be the case for Uranus
-    if (gl_FrontFacing) {
-        normal = vec3(-1.0, 0.0, 0.0);
-    }
-    else {
-        normal = vec3(1.0, 0.0, 0.0);
-    }
+  // The normal for the one plane depends on whether we are dealing
+  // with a front facing or back facing fragment
+  vec3 normal;
+  // The plane is oriented on the xz plane
+  // WARNING: This might not be the case for Uranus
+  if (gl_FrontFacing) {
+    normal = vec3(-1.0, 0.0, 0.0);
+  }
+  else {
+    normal = vec3(1.0, 0.0, 0.0);
+  }
 
-    // Reduce the color of the fragment by the user factor
-    // if we are facing away from the Sun
-    if (dot(sunPosition, normal) < 0) {
-        diffuse.xyz *= _nightFactor;
-    }
+  // Reduce the color of the fragment by the user factor
+  // if we are facing away from the Sun
+  if (dot(sunPosition, normal) < 0) {
+    diffuse.xyz *= _nightFactor;
+  }
 
-    Fragment frag;
-    frag.color = diffuse;
-    frag.depth = vs_position.w;
+  Fragment frag;
+  frag.color = diffuse;
+  frag.depth = vs_position.w;
 
-    //frag.gPosition  = vs_gPosition;
-    //frag.gNormal    = vs_gNormal;
+  //frag.gPosition  = vs_gPosition;
+  //frag.gNormal    = vs_gNormal;
 
-    return frag;
+  return frag;
 }
diff --git a/modules/space/shaders/rings_vs.glsl b/modules/space/shaders/rings_vs.glsl
index c81afe6f9d..788298015f 100644
--- a/modules/space/shaders/rings_vs.glsl
+++ b/modules/space/shaders/rings_vs.glsl
@@ -31,16 +31,14 @@ layout(location = 1) in vec2 in_st;
 
 out vec2 vs_st;
 out vec4 vs_position;
-//out vec4 vs_gPosition;
-//out vec3 vs_gNormal;
 
 uniform mat4 modelViewProjectionTransform;
 
 void main() {
-    vs_st = in_st;
+  vs_st = in_st;
 
-    vs_position = z_normalization(
-        modelViewProjectionTransform * vec4(in_position.xy, 0.0, 1.0)
-    );
-    gl_Position = vs_position;
+  vs_position = z_normalization(
+    modelViewProjectionTransform * vec4(in_position.xy, 0.0, 1.0)
+  );
+  gl_Position = vs_position;
 }
diff --git a/modules/space/shaders/star_fs.glsl b/modules/space/shaders/star_fs.glsl
index a38dd238b1..166c2515aa 100644
--- a/modules/space/shaders/star_fs.glsl
+++ b/modules/space/shaders/star_fs.glsl
@@ -23,14 +23,13 @@
  ****************************************************************************************/
 
 #include "fragment.glsl"
-#include "floatoperations.glsl"
 
 // keep in sync with renderablestars.h:ColorOption enum
-const int COLOROPTION_COLOR = 0;
-const int COLOROPTION_VELOCITY = 1; 
-const int COLOROPTION_SPEED = 2;
-const int COLOROPTION_OTHERDATA = 3;
-const int COLOROPTION_FIXEDCOLOR = 4;
+const int ColorOptionColor = 0;
+const int ColorOptionVelocity = 1; 
+const int ColorOptionSpeed = 2;
+const int ColorOptionOtherData = 3;
+const int ColorOptionFixedColor = 4;
 
 uniform sampler1D colorTexture;
 uniform sampler2D psfTexture;
@@ -44,73 +43,68 @@ uniform sampler1D otherDataTexture;
 uniform vec2 otherDataRange;
 uniform bool filterOutOfRange;
 
-in vec4 vs_position;
-in vec2 psfCoords;
-flat in vec4 ge_bvLumAbsMagAppMag;
+in vec3 vs_position;
+in vec2 texCoords;
+flat in float ge_bv;
 flat in vec3 ge_velocity;
 flat in float ge_speed;
-flat in float ge_observationDistance;
 flat in float gs_screenSpaceDepth;
 
 vec4 bv2rgb(float bv) {
-    // BV is [-0.4,2.0]
-    float t = (bv + 0.4) / (2.0 + 0.4);
-    return texture(colorTexture, t);
+  // BV is [-0.4,2.0]
+  float t = (bv + 0.4) / (2.0 + 0.4);
+  return texture(colorTexture, t);
 }
 
 bool isOtherDataValueInRange() {
-    float t = (ge_bvLumAbsMagAppMag.x - otherDataRange.x) / (otherDataRange.y - otherDataRange.x);
-    return t >= 0.0 && t <= 1.0;
+  float t = (ge_bv - otherDataRange.x) / (otherDataRange.y - otherDataRange.x);
+  return t >= 0.0 && t <= 1.0;
 }
 vec4 otherDataValue() {
-    float t = (ge_bvLumAbsMagAppMag.x - otherDataRange.x) / (otherDataRange.y - otherDataRange.x);
-    t = clamp(t, 0.0, 1.0);
-    return texture(otherDataTexture, t);
+  float t = (ge_bv - otherDataRange.x) / (otherDataRange.y - otherDataRange.x);
+  t = clamp(t, 0.0, 1.0);
+  return texture(otherDataTexture, t);
 }
 
 Fragment getFragment() {
-    // Something in the color calculations need to be changed because before it was dependent
-    // on the gl blend functions since the abuffer was not involved
-
-    vec4 color = vec4(0.0);
-    switch (colorOption) {
-        case COLOROPTION_COLOR: 
-            color = bv2rgb(ge_bvLumAbsMagAppMag.x);
-            break;
-        case COLOROPTION_VELOCITY:
-            color = vec4(abs(ge_velocity), 0.5);
-            break;
-        case COLOROPTION_SPEED:
-            // @TODO Include a transfer function here ---abock
-            color = vec4(vec3(ge_speed), 0.5);
-            break;
-        case COLOROPTION_OTHERDATA:
-            if (filterOutOfRange && !isOtherDataValueInRange()) {
-                discard;
-            }
-            else {
-                color = otherDataValue();
-            }
-            break;
-        case COLOROPTION_FIXEDCOLOR:
-            color = vec4(fixedColor, 1.0);
-            break;
-    }
-
-    vec4 textureColor = texture(psfTexture, 0.5 * psfCoords + 0.5);
-    vec4 fullColor = vec4(color.rgb, textureColor.a);
-    fullColor.a *= alphaValue;
-    
-    if (fullColor.a < 0.001) {
+  vec4 color = vec4(0.0);
+  switch (colorOption) {
+    case ColorOptionColor: 
+      color = bv2rgb(ge_bv);
+      break;
+    case ColorOptionVelocity:
+      color = vec4(abs(ge_velocity), 0.5);
+      break;
+    case ColorOptionSpeed:
+      // @TODO Include a transfer function here ---abock
+      color = vec4(vec3(ge_speed), 0.5);
+      break;
+    case ColorOptionOtherData:
+      if (filterOutOfRange && !isOtherDataValueInRange()) {
         discard;
-    }
+      }
+      else {
+        color = otherDataValue();
+      }
+      break;
+    case ColorOptionFixedColor:
+      color = vec4(fixedColor, 1.0);
+      break;
+  }
 
-    Fragment frag;
-    frag.color = fullColor;
-    frag.depth = gs_screenSpaceDepth;
-    frag.gPosition = vs_position;
-    frag.gNormal = vec4(0.0, 0.0, 0.0, 1.0);
-    frag.disableLDR2HDR = true;
-    
-    return frag;
+  vec4 textureColor = texture(psfTexture, texCoords);
+  vec4 fullColor = vec4(color.rgb, textureColor.a * alphaValue);
+  
+  if (fullColor.a < 0.001) {
+    discard;
+  }
+
+  Fragment frag;
+  frag.color = fullColor;
+  frag.depth = gs_screenSpaceDepth;
+  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 759927b7f1..36c8ad316b 100644
--- a/modules/space/shaders/star_ge.glsl
+++ b/modules/space/shaders/star_ge.glsl
@@ -24,7 +24,6 @@
 
 #version __CONTEXT__
 
-#include "floatoperations.glsl"
 #include "PowerScaling/powerScalingMath.hglsl"
 
 layout(points) in;
@@ -32,25 +31,20 @@ layout(triangle_strip, max_vertices = 4) out;
 
 in vec4 vs_bvLumAbsMagAppMag[];
 in vec3 vs_velocity[];
-in vec4 vs_gPosition[];
 in float vs_speed[];
 
-out vec4 vs_position;
-out vec2 psfCoords;
+out vec3 vs_position;
+out vec2 texCoords;
 
-flat out vec4 ge_bvLumAbsMagAppMag;
+flat out float ge_bv;
 flat out vec3 ge_velocity;
 flat out float ge_speed;
-flat out float ge_observationDistance;
 flat out float gs_screenSpaceDepth;
 
 uniform float magnitudeExponent;
 uniform dvec3 eyePosition;
 uniform dvec3 cameraUp;
 
-// uniform float FWHM;
-// uniform float betaConstant;
-
 uniform int psfParamConf;
 uniform float lumCent;
 uniform float radiusCent;
@@ -62,128 +56,169 @@ uniform dmat4 modelMatrix;
 const double PARSEC = 3.08567756E16;
 //const double PARSEC = 3.08567782E16;
 
-const vec2 corners[4] = vec2[4](
-    vec2(0.0, 0.0),
-    vec2(1.0, 0.0),
-    vec2(1.0, 1.0),
-    vec2(0.0, 1.0)
-);
+// FRAGILE
+// All of these values have to be synchronized with the values in the optionproperty
+const int SizeCompositionOptionAppBrightness = 0;
+const int SizeCompositionOptionLumSize = 1;
+const int SizeCompositionOptionLumSizeAppBrightness = 2;
+const int SizeCompositionOptionLumSizeAbsMagnitude = 3;
+const int SizeCompositionOptionLumSizeAppMagnitude = 4;
+const int SizeCompositionOptionLumSizeDistanceModulus = 5;
 
-const float SunTemperature = 5800.0f;
-const float SunAbsMagnitude = 4.83f;
+const float SunTemperature = 5800.0;
+const float SunAbsMagnitude = 4.83;
 const float SunRadius = 6.957E8; // meters
 
 float bvToKelvin(float bv) {
-    float tmp = 0.92f * bv;
-    return 4600.f * (1.f/(tmp+1.7f) +1.f/(tmp+0.62f));
+  float tmp = 0.92 * bv;
+  return 4600 * (1.0 / (tmp + 1.7) + 1.0 / (tmp + 0.62));
+}
+
+double scaleForApparentBrightness(dvec3 dpos, float luminance) {
+  // Working like Partiview
+  double pSize = pow(10, 29.0 + magnitudeExponent);
+  float luminosity = luminance * 10.0;
+  double distanceToStar = length(dpos - eyePosition);
+  return (pSize * luminosity) / distanceToStar;
+}
+
+double scaleForLuminositySize(float bv, float luminance, float absMagnitude) {
+  double adjustedLuminance = luminance + 5E9;
+  float L_over_Lsun = pow(2.51, SunAbsMagnitude - absMagnitude);
+  float temperature = bvToKelvin(bv);
+  float relativeTemperature = SunTemperature / temperature;
+  double starRadius = SunRadius * pow(relativeTemperature, 2.0) * sqrt(L_over_Lsun);
+  return (lumCent * adjustedLuminance + (radiusCent * starRadius)) * pow(10.0, magnitudeExponent);
+}
+
+double scaleForLuminositySizeAppBrightness(dvec3 dpos, float bv, float luminance, float absMagnitude) {
+  double luminosity = double(1.0 - luminance);
+  double distanceToStarInParsecs = trunc(length(dpos - eyePosition) / PARSEC);
+  double apparentBrightness = luminosity / distanceToStarInParsecs;
+  float L_over_Lsun = pow(2.51, SunAbsMagnitude - absMagnitude);
+  float temperature = bvToKelvin(bv);
+  float relativeTemperature = SunTemperature / temperature;
+  double starRadius = SunRadius * pow(relativeTemperature, 2.0) * sqrt(L_over_Lsun);
+
+  double scaledLuminance = lumCent * (luminance + 5E9);
+  double scaledStarRadius = radiusCent * starRadius;
+  double scaledBrightness = brightnessCent * apparentBrightness * 5E15;
+  return (scaledLuminance + scaledStarRadius + scaledBrightness) * pow(10.0, magnitudeExponent);
+}
+
+double scaleForAbsoluteMagnitude(float absMagnitude) {
+  return (-absMagnitude + 35) * pow(10.0, magnitudeExponent + 8.5);
+}
+
+double scaleForApparentMagnitude(dvec3 dpos, float absMag) {
+  double distanceToStarInMeters = length(dpos - eyePosition);
+  double distanceToCenterInMeters = length(eyePosition);
+  float distanceToStarInParsecs = float(distanceToStarInMeters/PARSEC); 
+  //float appMag = absMag + 5*log(distanceToStarInParsecs) - 5.0;
+  float appMag = absMag + 5.0 * (log(distanceToStarInParsecs/10.0)/log(2.0));
+  //appMag = vs_bvLumAbsMagAppMag[0].w;
+    
+  //scaleMultiply = (30.623 - appMag) * pow(10.0, magnitudeExponent + 7.0);// * 
+  //float(distanceToStarInMeters/distanceToCenterInMeters);
+    
+  return (-appMag + 50.0) * pow(10.0, magnitudeExponent + 7.5);
+  // return log(35.f + appMag) *  pow(10.0, magnitudeExponent + 6.5f);
+  // return exp((35.f - appMag) * 0.2) * pow(10.0, magnitudeExponent + 2.5f);
+  // return appMag * pow(10.0, magnitudeExponent + 8.5f);
+  // return exp((-30.0 - appMag) * 0.45) * pow(10.0, magnitudeExponent + 8.f);
+  // return pow(10.0, (appMag - absMag)*(1.0/5.0) + 1.0) * pow(10.0, magnitudeExponent + 3.f);
+}
+
+double scaleForDistanceModulus(float absMag) {
+  return exp((-30.623 - absMag) * 0.462) * pow(10.0, magnitudeExponent + 12.5) * 2000;
 }
 
 void main() {
-    vs_position = gl_in[0].gl_Position; // in object space
-    dvec4 dpos  = modelMatrix * dvec4(vs_position); 
+  vec3 pos = gl_in[0].gl_Position.xyz;
+  vs_position = pos; // in object space
+  dvec4 dpos  = modelMatrix * dvec4(pos, 1.0); 
 
-    ge_bvLumAbsMagAppMag = vs_bvLumAbsMagAppMag[0];
-    ge_velocity    = vs_velocity[0];
-    ge_speed       = vs_speed[0];
-        
-    double scaleMultiply = 1.0;
+  ge_bv = vs_bvLumAbsMagAppMag[0].x;
+  ge_velocity = vs_velocity[0];
+  ge_speed = vs_speed[0];
 
-    if (psfParamConf == 0) {
-        // Working like Partiview
-        double luminosity          = double(ge_bvLumAbsMagAppMag.y) * 10.0;
-        double pSize               = pow(10, magnitudeExponent + 29.0);
-        double distanceToStar      = length((dpos.xyz - eyePosition));  
-        double apparentBrightness  = pSize * luminosity / (distanceToStar);
-        scaleMultiply              = apparentBrightness;
-    }
-    else if (psfParamConf == 1) {
-        float L_over_Lsun = pow(2.51f, SunAbsMagnitude - ge_bvLumAbsMagAppMag.z);
-        float starTemperature = bvToKelvin(ge_bvLumAbsMagAppMag.x);
-        float starRadius = SunRadius * pow(SunTemperature/starTemperature, 2.f) * sqrt(L_over_Lsun);
-        scaleMultiply = ((lumCent * (ge_bvLumAbsMagAppMag.y + 5E9)) + 
-                        (radiusCent * double(starRadius))) * pow(10.0, magnitudeExponent);
-    }
-    else if (psfParamConf == 2) {
-        double luminosity              = double(1.0 - ge_bvLumAbsMagAppMag.y);
-        double distanceToStarInParsecs = trunc(length(dpos.xyz - eyePosition) / PARSEC);
-        double apparentBrightness      = luminosity / distanceToStarInParsecs;
-        float L_over_Lsun              = pow(2.51f, SunAbsMagnitude - ge_bvLumAbsMagAppMag.z);
-        float starTemperature          = bvToKelvin(ge_bvLumAbsMagAppMag.x);
-        float starRadius               = SunRadius * pow(SunTemperature/starTemperature, 2.f) * 
-                                         sqrt(L_over_Lsun);
-        scaleMultiply                  = ((lumCent * (ge_bvLumAbsMagAppMag.y + 5E9)) + 
-                                         (radiusCent * double(starRadius)) + 
-                                         (brightnessCent * apparentBrightness * 5E15)) * 
-                                         pow(10.0, magnitudeExponent);
-    }
-    else if (psfParamConf == 3) {
-        float absMag = ge_bvLumAbsMagAppMag.z;
-        scaleMultiply = (-absMag + 35.f) * pow(10.0, magnitudeExponent + 8.5f);
-    }
-    else if (psfParamConf == 4) {
-        float absMag = vs_bvLumAbsMagAppMag[0].z;
-        double distanceToStarInMeters = length(dpos.xyz - eyePosition);
-        double distanceToCenterInMeters = length(eyePosition);
-        float distanceToStarInParsecs = float(distanceToStarInMeters/PARSEC); 
-        //float appMag = absMag + 5*log(distanceToStarInParsecs) - 5.0;
-        float appMag = absMag + 5.0 * (log(distanceToStarInParsecs/10.0)/log(2.0));
-        //appMag = vs_bvLumAbsMagAppMag[0].w;
-        
-        //scaleMultiply = (30.623 - appMag) * pow(10.0, magnitudeExponent + 7.0);// * 
-        //float(distanceToStarInMeters/distanceToCenterInMeters);
-        
-        //scaleMultiply = (-appMag + 50.f) * pow(10.0, magnitudeExponent + 7.5f);
-        //scaleMultiply =  log(35.f + appMag) *  pow(10.0, magnitudeExponent + 6.5f);
-        //scaleMultiply = exp((35.f - appMag) * 0.2) * pow(10.0, magnitudeExponent + 2.5f);
-        //scaleMultiply = appMag * pow(10.0, magnitudeExponent + 8.5f);
-        scaleMultiply = exp((-30.0 - appMag) * 0.45) * pow(10.0, magnitudeExponent + 8.f);
-        //scaleMultiply = pow(10.0, (appMag - absMag)*(1.0/5.0) + 1.0) * pow(10.0, magnitudeExponent + 3.f);
-    }
-    else if (psfParamConf == 5) {
-        float absMag = ge_bvLumAbsMagAppMag.z;
-        scaleMultiply = exp((-30.623 - absMag) * 0.462) * pow(10.0, magnitudeExponent + 12.5f) * 2000;
-    }
+  double scaleMultiply = 1.0;
 
-    dvec3 scaledRight    = dvec3(0.0);
-    dvec3 scaledUp       = dvec3(0.0);
-    vec4 bottomLeftVertex, bottomRightVertex, topLeftVertex, topRightVertex;
+  if (psfParamConf == SizeCompositionOptionAppBrightness) {
+    float luminance = vs_bvLumAbsMagAppMag[0].y;
+
+    scaleMultiply = scaleForApparentBrightness(dpos.xyz, luminance);
+  }
+  else if (psfParamConf == SizeCompositionOptionLumSize) {
+    float bv = vs_bvLumAbsMagAppMag[0].x;
+    float luminance = vs_bvLumAbsMagAppMag[0].y;
+    float absMagnitude = vs_bvLumAbsMagAppMag[0].z;
+
+    scaleMultiply = scaleForLuminositySize(bv, luminance, absMagnitude);
+  }
+  else if (psfParamConf == SizeCompositionOptionLumSizeAppBrightness) {
+    float bv = vs_bvLumAbsMagAppMag[0].x;
+    float luminance = vs_bvLumAbsMagAppMag[0].y;
+    float absMagnitude = vs_bvLumAbsMagAppMag[0].z;
+
+    scaleMultiply = scaleForLuminositySizeAppBrightness(dpos.xyz, bv, luminance, absMagnitude);
+  }
+  else if (psfParamConf == SizeCompositionOptionLumSizeAbsMagnitude) {
+    float absMagnitude = vs_bvLumAbsMagAppMag[0].z;
+
+    scaleMultiply = scaleForAbsoluteMagnitude(absMagnitude);
+  }
+  else if (psfParamConf == SizeCompositionOptionLumSizeAppMagnitude) {
+    float absMagnitude = vs_bvLumAbsMagAppMag[0].z;
+
+    scaleMultiply = scaleForApparentMagnitude(dpos.xyz, absMagnitude);
+  }
+  else if (psfParamConf == SizeCompositionOptionLumSizeDistanceModulus) {
+    float absMagnitude = vs_bvLumAbsMagAppMag[0].z;
+    
+    scaleMultiply = scaleForDistanceModulus(absMagnitude);
+  }
+
+  dvec3 normal = eyePosition - dpos.xyz;
+  dvec3 newRight = normalize(cross(cameraUp, normal));
+  dvec3 newUp = normalize(cross(normal, newRight));
+  dvec3 scaledRight = scaleMultiply * newRight;
+  dvec3 scaledUp = scaleMultiply * newUp;
   
-    dvec3 normal   = normalize(eyePosition - dpos.xyz);
-    dvec3 newRight = normalize(cross(cameraUp, normal));
-    dvec3 newUp    = cross(normal, newRight);
-    scaledRight    = scaleMultiply * newRight;
-    scaledUp       = scaleMultiply * newUp;
-    
-    bottomLeftVertex = z_normalization(vec4(cameraViewProjectionMatrix * 
-                        dvec4(dpos.xyz - scaledRight - scaledUp, dpos.w)));
-    gs_screenSpaceDepth  = bottomLeftVertex.w;
-    
-    topRightVertex = z_normalization(vec4(cameraViewProjectionMatrix *
-                        dvec4(dpos.xyz + scaledUp + scaledRight, dpos.w)));        
+  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))
+  ); 
 
-    bottomRightVertex = z_normalization(vec4(cameraViewProjectionMatrix * 
-                        dvec4(dpos.xyz + scaledRight - scaledUp, dpos.w)));
-    
-    topLeftVertex = z_normalization(vec4(cameraViewProjectionMatrix * 
-                        dvec4(dpos.xyz + scaledUp - scaledRight, dpos.w)));
-    
-    // Build primitive
-    
-    gl_Position = bottomLeftVertex;
-    psfCoords   = vec2(-1.0, -1.0);
-    EmitVertex();
-    
-    gl_Position = bottomRightVertex;
-    psfCoords   = vec2(1.0, -1.0);
-    EmitVertex();
+  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))
+  );
 
-    gl_Position = topLeftVertex;
-    psfCoords   = vec2(-1.0, 1.0);
-    EmitVertex();
-    
-    gl_Position = topRightVertex;
-    psfCoords   = vec2(1.0, 1.0);
-    EmitVertex();
-    
-    EndPrimitive();
+  gs_screenSpaceDepth = lowerLeft.w;
+
+  // Build primitive    
+  gl_Position = lowerLeft;
+  texCoords = vec2(0.0, 0.0);
+  EmitVertex();
+  
+  gl_Position = lowerRight;
+  texCoords = vec2(1.0,0.0);
+  EmitVertex();
+
+  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/star_vs.glsl b/modules/space/shaders/star_vs.glsl
index 754deb5ea5..d03a9be2ad 100644
--- a/modules/space/shaders/star_vs.glsl
+++ b/modules/space/shaders/star_vs.glsl
@@ -24,8 +24,6 @@
 
 #version __CONTEXT__
 
-#include "PowerScaling/powerScaling_vs.hglsl"
-
 in vec3 in_position;
 in vec4 in_bvLumAbsMagAppMag;
 in vec3 in_velocity;
@@ -36,9 +34,9 @@ out vec3 vs_velocity;
 out float vs_speed;
 
 void main() {
-    vs_bvLumAbsMagAppMag = in_bvLumAbsMagAppMag;
-    vs_velocity          = in_velocity;
-    vs_speed             = in_speed;
+  vs_bvLumAbsMagAppMag = in_bvLumAbsMagAppMag;
+  vs_velocity = in_velocity;
+  vs_speed = in_speed;
 
-    gl_Position = vec4(in_position, 1.0);
+  gl_Position = vec4(in_position, 1.0);
 }
diff --git a/modules/space/speckloader.cpp b/modules/space/speckloader.cpp
new file mode 100644
index 0000000000..996ba3ab73
--- /dev/null
+++ b/modules/space/speckloader.cpp
@@ -0,0 +1,905 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2021                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/space/speckloader.h>
+
+#include <ghoul/fmt.h>
+#include <ghoul/filesystem/cachemanager.h>
+#include <ghoul/filesystem/file.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/assert.h>
+#include <cctype>
+#include <fstream>
+#include <functional>
+#include <string_view>
+
+namespace {
+    constexpr const int8_t DataCacheFileVersion = 10;
+    constexpr const int8_t LabelCacheFileVersion = 10;
+    constexpr const int8_t ColorCacheFileVersion = 10;
+
+    constexpr bool startsWith(std::string_view lhs, std::string_view rhs) noexcept {
+        return (rhs.size() <= lhs.size()) && (lhs.substr(0, rhs.size()) == rhs);
+    }
+
+    void strip(std::string& line) noexcept {
+        // 1. Remove all spaces from the beginning
+        // 2. Remove #
+        // 3. Remove all spaces from the new beginning
+        // 4. Remove all spaces from the end
+
+        while (!line.empty() && line[0] == ' ') {
+            line = line.substr(1);
+        }
+
+        if (!line.empty() && line[0] == '#') {
+            line = line.substr(1);
+        }
+
+        while (!line.empty() && line[0] == ' ') {
+            line = line.substr(1);
+        }
+
+        while (!line.empty() && line.back() == ' ') {
+            line = line.substr(0, line.size() - 1);
+        }
+    }
+
+    template <typename T, typename U>
+    void checkSize(U value, std::string_view message) {
+        if (value > std::numeric_limits<U>::max()) {
+            throw ghoul::RuntimeError(fmt::format("Error saving file: {}", message));
+        }
+    }
+
+    template <typename T>
+    using LoadCacheFunc = std::function<std::optional<T>(std::filesystem::path)>;
+
+    template <typename T>
+    using SaveCacheFunc = std::function<void(const T&, std::filesystem::path)>;
+
+    template <typename T>
+    using LoadSpeckFunc = std::function<T(
+        std::filesystem::path, openspace::speck::SkipAllZeroLines)>;
+
+
+
+    template <typename T>
+    T internalLoadFileWithCache(std::filesystem::path speckPath,
+                                     openspace::speck::SkipAllZeroLines skipAllZeroLines,
+                                     LoadSpeckFunc<T> loadSpeckFunction,
+                                     LoadCacheFunc<T> loadCacheFunction,
+                                     SaveCacheFunc<T> saveCacheFunction)
+    {
+        static_assert(
+            std::is_same_v<T, openspace::speck::Dataset> ||
+            std::is_same_v<T, openspace::speck::Labelset> ||
+            std::is_same_v<T, openspace::speck::ColorMap>
+        );
+
+        std::string cachePath = FileSys.cacheManager()->cachedFilename(speckPath);
+
+        if (std::filesystem::exists(cachePath)) {
+            LINFOC(
+                "SpeckLoader",
+                fmt::format(
+                    "Cached file '{}' used for file {}", cachePath, speckPath
+                )
+            );
+
+            std::optional<T> dataset = loadCacheFunction(cachePath);
+            if (dataset.has_value()) {
+                // We could load the cache file and we are now done with this
+                return *dataset;
+            }
+            else {
+                FileSys.cacheManager()->removeCacheFile(cachePath);
+            }
+        }
+        LINFOC("SpeckLoader", fmt::format("Loading file {}", speckPath));
+        T dataset = loadSpeckFunction(speckPath, skipAllZeroLines);
+
+        if (!dataset.entries.empty()) {
+            LINFOC("SpeckLoader", "Saving cache");
+            saveCacheFunction(dataset, cachePath);
+        }
+        return dataset;
+    }
+} // namespace
+
+namespace openspace::speck {
+
+namespace data {
+
+Dataset loadFile(std::filesystem::path path, SkipAllZeroLines skipAllZeroLines) {
+    ghoul_assert(std::filesystem::exists(path), "File must exist");
+
+    std::ifstream file(path);
+    if (!file.good()) {
+        throw ghoul::RuntimeError(fmt::format("Failed to open speck file {}", path));
+    }
+
+    Dataset res;
+
+    int nDataValues = 0;
+
+    std::string line;
+    // First phase: Loading the header information
+    while (std::getline(file, line)) {
+        // Ignore empty line or commented-out lines
+        if (line.empty() || line[0] == '#') {
+            continue;
+        }
+
+        // Guard against wrong line endings (copying files from Windows to Mac) causes
+        // lines to have a final \r
+        if (line.back() == '\r') {
+            line = line.substr(0, line.length() - 1);
+        }
+
+        strip(line);
+
+        // If the first character is a digit, we have left the preamble and are in the
+        // data section of the file
+        if (std::isdigit(line[0]) || line[0] == '-') {
+            break;
+        }
+
+
+        if (startsWith(line, "datavar")) {
+            // each datavar line is following the form:
+            // datavar <idx> <description>
+            // with <idx> being the index of the data variable 
+
+            std::stringstream str(line);
+            std::string dummy;
+            Dataset::Variable v;
+            str >> dummy >> v.index >> v.name;
+
+            nDataValues += 1;
+            res.variables.push_back(v);
+            continue;
+        }
+
+        if (startsWith(line, "texturevar")) {
+            // each texturevar line is following the form:
+            // texturevar <idx>
+            // where <idx> is the data value index where the texture index is stored
+            if (res.textureDataIndex != -1) {
+                throw ghoul::RuntimeError(fmt::format(
+                    "Error loading speck file {}: Texturevar defined twice", path
+                ));
+            }
+
+            std::stringstream str(line);
+            std::string dummy;
+            str >> dummy >> res.textureDataIndex;
+            
+            continue;
+        }
+
+        if (startsWith(line, "polyorivar")) {
+            // each polyorivar line is following the form:
+            // texturevar <idx>
+            // where <idx> is the data value index where the orientation index storage
+            // starts. There are 6 values stored in total, xyz + uvw
+
+            if (res.orientationDataIndex != -1) {
+                throw ghoul::RuntimeError(fmt::format(
+                    "Error loading speck file {}: Orientation index defined twice", path
+                ));
+            }
+
+            std::stringstream str(line);
+            std::string dummy;
+            str >> dummy >> res.orientationDataIndex;
+            
+            // Ok.. this is kind of weird.  Speck unfortunately doesn't tell us in the 
+            // specification how many values a datavar has. Usually this is 1 value per
+            // datavar, unless it is a polygon orientation thing. Now, the datavar name
+            // for these can be anything (have seen 'orientation' and 'ori' before, so we
+            // can't really check by name for these or we will miss some if they are
+            // mispelled or whatever. So we have to go the roundabout way of adding the
+            // 5 remaining values (the 6th nDataValue was already added in the
+            // corresponding 'datavar' section) here
+            nDataValues += 5;
+
+            continue;
+        }
+
+        if (startsWith(line, "texture")) {
+            // each texture line is following one of two forms:
+            // 1:   texture -M 1 halo.sgi
+            // 2:   texture 1 M1.sgi
+            // The parameter in #1 is currently being ignored
+
+            std::stringstream str(line);
+
+            std::string dummy;
+            str >> dummy;
+
+            if (line.find('-') != std::string::npos) {
+                str >> dummy;
+            }
+
+            Dataset::Texture texture;
+            str >> texture.index >> texture.file;
+
+            for (const Dataset::Texture& t : res.textures) {
+                if (t.index == texture.index) {
+                    throw ghoul::RuntimeError(fmt::format(
+                        "Error loading speck file {}: Texture index '{}' defined twice",
+                        path, texture.index
+                    ));
+                }
+            }
+
+            res.textures.push_back(texture);
+            continue;
+        }
+    }
+
+    std::sort(
+        res.variables.begin(), res.variables.end(),
+        [](const Dataset::Variable& lhs, const Dataset::Variable& rhs) {
+            return lhs.index < rhs.index;
+        }
+    );
+    
+    std::sort(
+        res.textures.begin(), res.textures.end(),
+        [](const Dataset::Texture& lhs, const Dataset::Texture& rhs) {
+            return lhs.index < rhs.index;
+        }
+    );
+
+    // For the first line, we already loaded it and rejected it above, so if we do another
+    // std::getline, we'd miss the first data value line
+    bool isFirst = true;
+    while (isFirst || std::getline(file, line)) {
+        isFirst = false;
+
+        // Ignore empty line or commented-out lines
+        if (line.empty() || line[0] == '#') {
+            continue;
+        }
+
+        // Guard against wrong line endings (copying files from Windows to Mac) causes
+        // lines to have a final \r
+        if (line.back() == '\r') {
+            line = line.substr(0, line.length() - 1);
+        }
+        
+        strip(line);
+
+        if (line.empty()) {
+            continue;
+        }
+
+        // If the first character is a digit, we have left the preamble and are in the
+        // data section of the file
+        if (!std::isdigit(line[0]) && line[0] != '-') {
+            throw ghoul::RuntimeError(fmt::format(
+                "Error loading speck file {}: Header information and datasegment "
+                "intermixed", path
+            ));
+        }
+
+        bool allZero = true;
+
+        std::stringstream str(line);
+        Dataset::Entry entry;
+        str >> entry.position.x >> entry.position.y >> entry.position.z;
+        allZero &= (entry.position == glm::vec3(0.0));
+
+        entry.data.resize(nDataValues);
+        for (int i = 0; i < nDataValues; i += 1) {
+            str >> entry.data[i];
+            allZero &= (entry.data[i] == 0.0);
+        }
+
+        if (skipAllZeroLines && allZero) {
+            continue;
+        }
+
+        std::string rest;
+        std::getline(str, rest);
+        if (!rest.empty()) {
+
+            strip(rest);
+            entry.comment = rest;
+        }
+
+        res.entries.push_back(std::move(entry));
+    }
+
+#ifdef _DEBUG
+    if (!res.entries.empty()) {
+        size_t nValues = res.entries[0].data.size();
+        ghoul_assert(nDataValues == nValues, "nDataValues calculation went wrong");
+        for (const Dataset::Entry& e : res.entries) {
+            ghoul_assert(
+                e.data.size() == nDataValues,
+                "Row had different number of data values"
+            );
+        }
+    }
+#endif
+
+    return res;
+}
+
+std::optional<Dataset> loadCachedFile(std::filesystem::path path) {
+    std::ifstream file(path, std::ios::binary);
+    if (!file.good()) {
+        return std::nullopt;
+    }
+    
+    Dataset result;
+
+    int8_t fileVersion;
+    file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
+    if (fileVersion != DataCacheFileVersion) {
+        // Incompatible version and we won't be able to read the file
+        return std::nullopt;
+    }
+
+    //
+    // Read variables
+    uint16_t nVariables;
+    file.read(reinterpret_cast<char*>(&nVariables), sizeof(uint16_t));
+    result.variables.resize(nVariables);
+    for (int i = 0; i < nVariables; i += 1) {
+        Dataset::Variable var;
+
+        int16_t idx;
+        file.read(reinterpret_cast<char*>(&idx), sizeof(int16_t));
+        var.index = idx;
+
+        uint16_t len;
+        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
+        var.name.resize(len);
+        file.read(var.name.data(), len);
+
+        result.variables[i] = std::move(var);
+    }
+
+    //
+    // Read textures
+    uint16_t nTextures;
+    file.read(reinterpret_cast<char*>(&nTextures), sizeof(uint16_t));
+    result.textures.resize(nTextures);
+    for (int i = 0; i < nTextures; i += 1) {
+        Dataset::Texture tex;
+        
+        int16_t idx;
+        file.read(reinterpret_cast<char*>(&idx), sizeof(int16_t));
+        tex.index = idx;
+
+        uint16_t len;
+        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
+        tex.file.resize(len);
+        file.read(tex.file.data(), len);
+
+        result.textures[i] = std::move(tex);
+    }
+
+    //
+    // Read indices
+    int16_t texDataIdx;
+    file.read(reinterpret_cast<char*>(&texDataIdx), sizeof(int16_t));
+    result.textureDataIndex = texDataIdx;
+
+    int16_t oriDataIdx;
+    file.read(reinterpret_cast<char*>(&oriDataIdx), sizeof(int16_t));
+    result.orientationDataIndex = oriDataIdx;
+
+    //
+    // Read entries
+    uint64_t nEntries;
+    file.read(reinterpret_cast<char*>(&nEntries), sizeof(uint64_t));
+    result.entries.reserve(nEntries);
+    for (uint64_t i = 0; i < nEntries; i += 1) {
+        Dataset::Entry e;
+        file.read(reinterpret_cast<char*>(&e.position.x), sizeof(float));
+        file.read(reinterpret_cast<char*>(&e.position.y), sizeof(float));
+        file.read(reinterpret_cast<char*>(&e.position.z), sizeof(float));
+
+        uint16_t nValues;
+        file.read(reinterpret_cast<char*>(&nValues), sizeof(uint16_t));
+        e.data.resize(nValues);
+        file.read(reinterpret_cast<char*>(e.data.data()), nValues * sizeof(float));
+
+        uint16_t len;
+        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
+        if (len > 0) {
+            std::string comment;
+            comment.resize(len);
+            file.read(comment.data(), len);
+            e.comment = std::move(comment);
+        }
+
+        result.entries.push_back(std::move(e));
+    }
+
+    return result;
+}
+
+void saveCachedFile(const Dataset& dataset, std::filesystem::path path) {
+    std::ofstream file(path, std::ofstream::binary);
+
+    file.write(reinterpret_cast<const char*>(&DataCacheFileVersion), sizeof(int8_t));
+
+    //
+    // Store variables
+    checkSize<uint16_t>(dataset.variables.size(), "Too many variables");
+    uint16_t nVariables = static_cast<uint16_t>(dataset.variables.size());
+    file.write(reinterpret_cast<const char*>(&nVariables), sizeof(uint16_t));
+    for (const Dataset::Variable& var : dataset.variables) {
+        checkSize<int16_t>(var.index, "Variable index too large");
+        int16_t idx = static_cast<int16_t>(var.index);
+        file.write(reinterpret_cast<const char*>(&idx), sizeof(int16_t));
+
+        checkSize<uint16_t>(var.name.size(), "Variable name too long");
+        uint16_t len = static_cast<uint16_t>(var.name.size());
+        file.write(reinterpret_cast<const char*>(&len), sizeof(uint16_t));
+        file.write(var.name.data(), len);
+    }
+
+    //
+    // Store textures
+    checkSize<uint16_t>(dataset.textures.size(), "Too many textures");
+    uint16_t nTextures = static_cast<uint16_t>(dataset.textures.size());
+    file.write(reinterpret_cast<const char*>(&nTextures), sizeof(uint16_t));
+    for (const Dataset::Texture& tex : dataset.textures) {
+        checkSize<int16_t>(tex.index, "Texture index too large");
+        int16_t idx = static_cast<int16_t>(tex.index);
+        file.write(reinterpret_cast<const char*>(&idx), sizeof(int16_t));
+
+
+        checkSize<uint16_t>(tex.file.size(), "Texture file too long");
+        uint16_t len = static_cast<uint16_t>(tex.file.size());
+        file.write(reinterpret_cast<const char*>(&len), sizeof(uint16_t));
+        file.write(tex.file.data(), len);
+    }
+
+    //
+    // Store indices
+    checkSize<int16_t>(dataset.textureDataIndex, "Texture index too large");
+    int16_t texIdx = static_cast<int16_t>(dataset.textureDataIndex);
+    file.write(reinterpret_cast<const char*>(&texIdx), sizeof(int16_t));
+
+    checkSize<int16_t>(dataset.orientationDataIndex, "Orientation index too large");
+    int16_t orientationIdx = static_cast<int16_t>(dataset.orientationDataIndex);
+    file.write(reinterpret_cast<const char*>(&orientationIdx), sizeof(int16_t));
+
+    //
+    // Store entries
+    checkSize<uint64_t>(dataset.entries.size(), "Too many entries");
+    uint64_t nEntries = static_cast<uint64_t>(dataset.entries.size());
+    file.write(reinterpret_cast<const char*>(&nEntries), sizeof(uint64_t));
+    for (const Dataset::Entry& e : dataset.entries) {
+        file.write(reinterpret_cast<const char*>(&e.position.x), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&e.position.y), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&e.position.z), sizeof(float));
+
+        checkSize<uint16_t>(e.data.size(), "Too many data variables");
+        uint16_t nValues = static_cast<uint16_t>(e.data.size());
+        file.write(reinterpret_cast<const char*>(&nValues), sizeof(uint16_t));
+        file.write(
+            reinterpret_cast<const char*>(e.data.data()),
+            e.data.size() * sizeof(float)
+        );
+
+        if (e.comment.has_value()) {
+            checkSize<uint16_t>(e.comment->size(), "Comment too long");
+        }
+        uint16_t commentLen = e.comment.has_value() ?
+            static_cast<uint16_t>(e.comment->size()) :
+            0;
+        file.write(reinterpret_cast<const char*>(&commentLen), sizeof(uint16_t));
+        if (e.comment.has_value()) {
+            file.write(e.comment->data(), e.comment->size());
+        }
+    }
+}
+
+Dataset loadFileWithCache(std::filesystem::path speckPath,
+                               SkipAllZeroLines skipAllZeroLines)
+{
+    return internalLoadFileWithCache<Dataset>(
+        speckPath,
+        skipAllZeroLines,
+        &loadFile,
+        &loadCachedFile,
+        &saveCachedFile
+    );
+}
+
+} // namespace data
+
+namespace label {
+
+Labelset loadFile(std::filesystem::path path, SkipAllZeroLines) {
+    ghoul_assert(std::filesystem::exists(path), "File must exist");
+
+    std::ifstream file(path);
+    if (!file.good()) {
+        throw ghoul::RuntimeError(fmt::format("Failed to open speck file '{}'", path));
+    }
+
+    Labelset res;
+
+    std::string line;
+    // First phase: Loading the header information
+    while (std::getline(file, line)) {
+        // Ignore empty line or commented-out lines
+        if (line.empty() || line[0] == '#') {
+            continue;
+        }
+
+        // Guard against wrong line endings (copying files from Windows to Mac) causes
+        // lines to have a final \r
+        if (line.back() == '\r') {
+            line = line.substr(0, line.length() - 1);
+        }
+
+        strip(line);
+
+        // If the first character is a digit, we have left the preamble and are in the
+        // data section of the file
+        if (std::isdigit(line[0]) || line[0] == '-') {
+            break;
+        }
+
+        if (startsWith(line, "textcolor")) {
+            // each textcolor line is following the form:
+            // textcolor <idx>
+            // with <idx> being the index of the color into some configuration file (not
+            // really sure how these configuration files work, but they don't seem to be
+            // included in the speck file)
+            if (res.textColorIndex != -1) {
+                throw ghoul::RuntimeError(fmt::format(
+                    "Error loading label file '{}': Textcolor defined twice", path
+                ));
+            }
+
+
+            std::stringstream str(line);
+            std::string dummy;
+            str >> dummy >> res.textColorIndex;
+            continue;
+        }
+    }
+
+    // For the first line, we already loaded it and rejected it above, so if we do another
+    // std::getline, we'd miss the first data value line
+    bool isFirst = true;
+    while (isFirst || std::getline(file, line)) {
+        isFirst = false;
+
+        // Ignore empty line or commented-out lines
+        if (line.empty() || line[0] == '#') {
+            continue;
+        }
+
+        // Guard against wrong line endings (copying files from Windows to Mac) causes
+        // lines to have a final \r
+        if (line.back() == '\r') {
+            line = line.substr(0, line.length() - 1);
+        }
+
+        strip(line);
+
+        if (line.empty()) {
+            continue;
+        }
+
+        // If the first character is a digit, we have left the preamble and are in the
+        // data section of the file
+        if (!std::isdigit(line[0]) && line[0] != '-') {
+            throw ghoul::RuntimeError(fmt::format(
+                "Error loading label file '{}': Header information and datasegment "
+                "intermixed", path
+            ));
+        }
+
+        // Each line looks like this:
+        // <x> <y> <z> text <label> # potential comment
+        // so we want to get the position, remove the 'text' text and the potential
+        // comment at the end
+        std::stringstream str(line);
+        Labelset::Entry entry;
+        str >> entry.position.x >> entry.position.y >> entry.position.z;
+
+        std::string rest;
+        std::getline(str, rest);
+        strip(rest);
+
+        if (!startsWith(rest, "text")) {
+            throw ghoul::RuntimeError(fmt::format(
+                "Error loading label file '{}': File contains some value between "
+                "positions and text label, which is unsupported", path
+            ));
+        }
+
+        // Remove the 'text' text
+        rest = rest.substr(std::string_view("text ").size());
+
+        // Remove the trailing comment
+        for (size_t i = 0; i < rest.size(); i += 1) {
+            if (rest[i] == '#') {
+                rest = rest.substr(0, i);
+                break;
+            }
+        }
+
+        strip(rest);
+
+        entry.text = rest;
+        if (!rest.empty()) {
+            res.entries.push_back(std::move(entry));
+        }
+    }
+
+    return res;
+}
+
+std::optional<Labelset> loadCachedFile(std::filesystem::path path) {
+    std::ifstream file(path, std::ios::binary);
+    if (!file.good()) {
+        return std::nullopt;
+    }
+
+    int8_t fileVersion;
+    file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
+    if (fileVersion != LabelCacheFileVersion) {
+        // Incompatible version and we won't be able to read the file
+        return std::nullopt;
+    }
+
+    Labelset result;
+
+    int16_t textColorIdx;
+    file.read(reinterpret_cast<char*>(&textColorIdx), sizeof(int16_t));
+    result.textColorIndex = textColorIdx;
+
+    uint32_t nEntries;
+    file.read(reinterpret_cast<char*>(&nEntries), sizeof(uint32_t));
+    result.entries.reserve(nEntries);
+    for (unsigned int i = 0; i < nEntries; i += 1) {
+        Labelset::Entry e;
+        file.read(reinterpret_cast<char*>(&e.position.x), sizeof(float));
+        file.read(reinterpret_cast<char*>(&e.position.y), sizeof(float));
+        file.read(reinterpret_cast<char*>(&e.position.z), sizeof(float));
+
+        uint16_t len;
+        file.read(reinterpret_cast<char*>(&len), sizeof(uint16_t));
+        e.text.resize(len);
+        file.read(e.text.data(), len);
+
+        result.entries.push_back(e);
+    }
+
+    return result;
+}
+
+void saveCachedFile(const Labelset& labelset, std::filesystem::path path) {
+    std::ofstream file(path, std::ofstream::binary);
+
+    file.write(reinterpret_cast<const char*>(&LabelCacheFileVersion), sizeof(int8_t));
+
+    //
+    // Storage text color
+    checkSize<int16_t>(labelset.textColorIndex, "Too high text color");
+    int16_t textColorIdx = static_cast<int16_t>(labelset.textColorIndex);
+    file.write(reinterpret_cast<const char*>(&textColorIdx), sizeof(int16_t));
+
+    //
+    // Storage text lines
+    checkSize<uint32_t>(labelset.entries.size(), "Too many entries");
+    uint32_t nEntries = static_cast<uint32_t>(labelset.entries.size());
+    file.write(reinterpret_cast<const char*>(&nEntries), sizeof(uint32_t));
+    for (const Labelset::Entry& e : labelset.entries) {
+        file.write(reinterpret_cast<const char*>(&e.position.x), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&e.position.y), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&e.position.z), sizeof(float));
+
+        checkSize<uint16_t>(e.text.size(), "Text too long");
+        uint16_t len = static_cast<uint16_t>(e.text.size());
+        file.write(reinterpret_cast<const char*>(&len), sizeof(uint16_t));
+        file.write(e.text.data(), len);
+    }
+}
+
+Labelset loadFileWithCache(std::filesystem::path speckPath,
+                                SkipAllZeroLines skipAllZeroLines)
+{
+    return internalLoadFileWithCache<Labelset>(
+        speckPath,
+        skipAllZeroLines,
+        &loadFile,
+        &loadCachedFile,
+        &saveCachedFile
+    );
+}
+
+} // namespace label
+
+namespace color {
+
+ColorMap loadFile(std::filesystem::path path, SkipAllZeroLines) {
+    ghoul_assert(std::filesystem::exists(path), "File must exist");
+
+    std::ifstream file(path);
+    if (!file.good()) {
+        throw ghoul::RuntimeError(fmt::format("Failed to open speck file '{}'", path));
+    }
+
+    ColorMap res;
+    int nColorLines = -1;
+
+    // The beginning of the speck file has a header that either contains comments
+    // (signaled by a preceding '#') or information about the structure of the file
+    // (signaled by the keywords 'datavar', 'texturevar', and 'texture')
+    std::string line;
+    while (std::getline(file, line)) {
+        // Ignore empty line or commented-out lines
+        if (line.empty() || line[0] == '#') {
+            continue;
+        }
+
+        // Guard against wrong line endings (copying files from Windows to Mac) causes
+        // lines to have a final \r
+        if (line.back() == '\r') {
+            line = line.substr(0, line.length() - 1);
+        }
+
+        strip(line);
+
+        std::stringstream str(line);
+        if (nColorLines == -1) {
+            // This is the first time we get this far, it will have to be the first number
+            // meaning that it is the number of color values
+            
+            str >> nColorLines;
+            res.entries.reserve(nColorLines);
+        }
+        else {
+            // We have already read the number of color lines, so we are in the process of
+            // reading the individual value lines
+
+            glm::vec4 color;
+            str >> color.x >> color.y >> color.z >> color.w;
+            res.entries.push_back(std::move(color));
+        }
+    }
+
+    if (nColorLines != static_cast<int>(res.entries.size())) {
+        LWARNINGC("SpeckLoader", fmt::format(
+            "While loading color map, the expected number of color values '{}' was "
+            "different from the actual number of color values '{}'",
+            nColorLines, res.entries.size()
+        ));
+    }
+
+    return res;
+}
+
+std::optional<ColorMap> loadCachedFile(std::filesystem::path path) {
+    std::ifstream file(path, std::ios::binary);
+    if (!file.good()) {
+        return std::nullopt;
+    }
+
+    int8_t fileVersion;
+    file.read(reinterpret_cast<char*>(&fileVersion), sizeof(int8_t));
+    if (fileVersion != ColorCacheFileVersion) {
+        // Incompatible version and we won't be able to read the file
+        return std::nullopt;
+    }
+
+    ColorMap result;
+
+    uint32_t nColors;
+    file.read(reinterpret_cast<char*>(&nColors), sizeof(uint32_t));
+    result.entries.reserve(nColors);
+    for (unsigned int i = 0; i < nColors; i += 1) {
+        glm::vec4 color;
+        file.read(reinterpret_cast<char*>(&color.x), sizeof(float));
+        file.read(reinterpret_cast<char*>(&color.y), sizeof(float));
+        file.read(reinterpret_cast<char*>(&color.z), sizeof(float));
+        file.read(reinterpret_cast<char*>(&color.w), sizeof(float));
+        result.entries.push_back(color);
+    }
+    return result;
+}
+
+void saveCachedFile(const ColorMap& colorMap, std::filesystem::path path) {
+    std::ofstream file(path, std::ofstream::binary);
+
+    file.write(reinterpret_cast<const char*>(&ColorCacheFileVersion), sizeof(int8_t));
+
+    uint32_t nColors = static_cast<uint32_t>(colorMap.entries.size());
+    file.write(reinterpret_cast<const char*>(&nColors), sizeof(uint32_t));
+    for (const glm::vec4& color : colorMap.entries) {
+        file.write(reinterpret_cast<const char*>(&color.x), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&color.y), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&color.z), sizeof(float));
+        file.write(reinterpret_cast<const char*>(&color.w), sizeof(float));
+    }
+}
+
+ColorMap loadFileWithCache(std::filesystem::path path, SkipAllZeroLines skipAllZeroLines)
+{
+    return internalLoadFileWithCache<ColorMap>(
+        path,
+        skipAllZeroLines,
+        &loadFile,
+        &loadCachedFile,
+        &saveCachedFile
+    );
+}
+
+} // namespace color
+
+int Dataset::index(std::string_view variableName) const {
+    for (const Dataset::Variable& v : variables) {
+        if (v.name == variableName) {
+            return v.index;
+        }
+    }
+    return -1;
+}
+
+bool Dataset::normalizeVariable(std::string_view variableName) {
+    std::optional<int> idx;
+    for (const Dataset::Variable& var : variables) {
+        if (var.name == variableName) {
+            idx = var.index;
+            break;
+        }
+    }
+
+    if (!idx.has_value()) {
+        // We didn't find the variable that was specified
+        return false;
+    }
+
+    float minValue = std::numeric_limits<float>::max();
+    float maxValue = -std::numeric_limits<float>::max();
+    for (Dataset::Entry& e : entries) {
+        minValue = std::min(minValue, e.data[*idx]);
+        maxValue = std::max(maxValue, e.data[*idx]);
+    }
+
+    for (Dataset::Entry& e : entries) {
+        e.data[*idx] = (e.data[*idx] - minValue) / (maxValue - minValue);
+    }
+
+    return true;
+}
+
+} // namespace openspace::speck
diff --git a/modules/space/speckloader.h b/modules/space/speckloader.h
new file mode 100644
index 0000000000..a733b3f02c
--- /dev/null
+++ b/modules/space/speckloader.h
@@ -0,0 +1,122 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2021                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_SPACE___SPECKLOADER___H__
+#define __OPENSPACE_MODULE_SPACE___SPECKLOADER___H__
+
+#include <ghoul/glm.h>
+#include <ghoul/misc/boolean.h>
+#include <filesystem>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace openspace::speck {
+
+BooleanType(SkipAllZeroLines);
+
+struct Dataset {
+    struct Variable {
+        int index = -1;
+        std::string name;
+    };
+    std::vector<Variable> variables;
+
+    struct Texture {
+        int index = -1;
+        std::string file;
+    };
+    std::vector<Texture> textures;
+
+    int textureDataIndex = -1;
+    int orientationDataIndex = -1;
+
+    struct Entry {
+        glm::vec3 position;
+        std::vector<float> data;
+        std::optional<std::string> comment;
+    };
+    std::vector<Entry> entries;
+
+    int index(std::string_view variableName) const;
+    bool normalizeVariable(std::string_view variableName);
+};
+
+struct Labelset {
+    int textColorIndex = -1;
+
+    struct Entry {
+        glm::vec3 position;
+        std::string text;
+    };
+    std::vector<Entry> entries;
+};
+
+struct ColorMap {
+    std::vector<glm::vec4> entries;
+};
+
+namespace data {
+
+    Dataset loadFile(std::filesystem::path path,
+        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+
+    std::optional<Dataset> loadCachedFile(std::filesystem::path path);
+    void saveCachedFile(const Dataset& dataset, std::filesystem::path path);
+
+    Dataset loadFileWithCache(std::filesystem::path speckPath,
+        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+
+} // namespace data
+
+namespace label {
+
+    Labelset loadFile(std::filesystem::path path,
+        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+
+    std::optional<Labelset> loadCachedFile(std::filesystem::path path);
+    void saveCachedFile(const Labelset& labelset, std::filesystem::path path);
+
+    Labelset loadFileWithCache(std::filesystem::path speckPath,
+        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+
+} // namespace label
+
+namespace color {
+
+    ColorMap loadFile(std::filesystem::path path,
+        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+
+    std::optional<ColorMap> loadCachedFile(std::filesystem::path path);
+    void saveCachedFile(const ColorMap& colorMap, std::filesystem::path path);
+
+    ColorMap loadFileWithCache(std::filesystem::path path,
+        SkipAllZeroLines skipAllZeroLines = SkipAllZeroLines::Yes);
+
+} // namespace color
+
+
+} // namespace openspace::speck
+
+#endif // __OPENSPACE_MODULE_SPACE___SPECKLOADER___H__
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index 6f294d3055..95bca1255d 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -33,6 +33,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
+#include <filesystem>
 #include <fstream>
 
 namespace {
@@ -57,9 +58,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation HorizonsTranslation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "base_transform_translation_horizons";
-    return doc;
+    return codegen::doc<Parameters>("base_transform_translation_horizons");
 }
 
 HorizonsTranslation::HorizonsTranslation()
@@ -69,8 +68,10 @@ HorizonsTranslation::HorizonsTranslation()
 
     _horizonsTextFile.onChange([&](){
         requireUpdate();
-        _fileHandle = std::make_unique<ghoul::filesystem::File>(_horizonsTextFile);
-        _fileHandle->setCallback([&](const ghoul::filesystem::File&) {
+        _fileHandle = std::make_unique<ghoul::filesystem::File>(
+            _horizonsTextFile.value()
+        );
+        _fileHandle->setCallback([this]() {
              requireUpdate();
              notifyObservers();
          });
@@ -82,7 +83,7 @@ HorizonsTranslation::HorizonsTranslation(const ghoul::Dictionary& dictionary)
     : HorizonsTranslation()
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
-    _horizonsTextFile = absPath(p.horizonsTextFile);
+    _horizonsTextFile = absPath(p.horizonsTextFile).string();
 }
 
 glm::dvec3 HorizonsTranslation::position(const UpdateData& data) const {
@@ -113,16 +114,12 @@ glm::dvec3 HorizonsTranslation::position(const UpdateData& data) const {
 
 void HorizonsTranslation::loadData() {
     std::string file = _horizonsTextFile;
-    if (!FileSys.fileExists(absPath(file))) {
+    if (!std::filesystem::is_regular_file(absPath(file))) {
         return;
     }
 
-    std::string cachedFile = FileSys.cacheManager()->cachedFilename(
-        file,
-        ghoul::filesystem::CacheManager::Persistent::Yes
-    );
-
-    bool hasCachedFile = FileSys.fileExists(cachedFile);
+    std::string cachedFile = FileSys.cacheManager()->cachedFilename(file);
+    bool hasCachedFile = std::filesystem::is_regular_file(cachedFile);
     if (hasCachedFile) {
         LINFO(fmt::format(
             "Cached file '{}' used for Horizon file '{}'", cachedFile, file
diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp
index 865a2fe299..bdb62a1f3c 100644
--- a/modules/space/translation/keplertranslation.cpp
+++ b/modules/space/translation/keplertranslation.cpp
@@ -141,9 +141,7 @@ KeplerTranslation::RangeError::RangeError(std::string off)
 {}
 
 documentation::Documentation KeplerTranslation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_transform_kepler";
-    return doc;
+    return codegen::doc<Parameters>("space_transform_kepler");
 }
 
 KeplerTranslation::KeplerTranslation()
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index 519539d9d6..98cf2231ef 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -33,6 +33,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
+#include <filesystem>
 #include <optional>
 
 namespace {
@@ -61,6 +62,13 @@ namespace {
         "should be retrieved. The default value is GALACTIC."
     };
 
+    constexpr openspace::properties::Property::PropertyInfo FixedDateInfo = {
+        "FixedDate",
+        "Fixed Date",
+        "A time to lock the position to. Setting this to an empty string will "
+        "unlock the time and return to position based on current simulation time."
+    };
+
     struct [[codegen::Dictionary(SpiceTranslation)]] Parameters {
         // [[codegen::verbatim(TargetInfo.description)]]
         std::string target
@@ -73,6 +81,9 @@ namespace {
         std::optional<std::string> frame
             [[codegen::annotation("A valid SPICE NAIF name for a reference frame")]];
 
+        std::optional<std::string> fixedDate
+            [[codegen::annotation("A date to lock the position to")]];
+
         // A single kernel or list of kernels that this SpiceTranslation depends on. All
         // provided kernels will be loaded before any other operation is performed
         std::optional<std::variant<std::vector<std::string>, std::string>> kernels;
@@ -83,9 +94,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation SpiceTranslation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_translation_spicetranslation";
-    return doc;
+    return codegen::doc<Parameters>("space_translation_spicetranslation");
 }
 
 SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
@@ -93,11 +102,12 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
     , _observer(ObserverInfo)
     , _frame(FrameInfo, DefaultReferenceFrame)
     , _cachedFrame(DefaultReferenceFrame)
+    , _fixedDate(FixedDateInfo)
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
     auto loadKernel = [](const std::string& kernel) {
-        if (!FileSys.fileExists(kernel)) {
+        if (!std::filesystem::is_regular_file(kernel)) {
             throw SpiceManager::SpiceException(fmt::format(
                 "Kernel '{}' does not exist", kernel
             ));
@@ -113,11 +123,11 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
 
     if (p.kernels.has_value()) {
         if (std::holds_alternative<std::string>(*p.kernels)) {
-            loadKernel(absPath(std::get<std::string>(*p.kernels)));
+            loadKernel(absPath(std::get<std::string>(*p.kernels)).string());
         }
         else {
             for (const std::string& k : std::get<std::vector<std::string>>(*p.kernels)) {
-                loadKernel(absPath(k));
+                loadKernel(absPath(k).string());
             }
         }
     }
@@ -143,6 +153,17 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
     });
     addProperty(_frame);
 
+    _fixedDate.onChange([this]() {
+        if (_fixedDate.value().empty()) {
+            _fixedEphemerisTime = std::nullopt;
+        }
+        else {
+            _fixedEphemerisTime = SpiceManager::ref().ephemerisTimeFromDate(_fixedDate);
+        }
+    });
+    _fixedDate = p.fixedDate.value_or(_fixedDate);
+    addProperty(_fixedDate);
+
     _target = p.target;
     _observer = p.observer;
     _frame = p.frame.value_or(_frame);
@@ -150,12 +171,17 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
 
 glm::dvec3 SpiceTranslation::position(const UpdateData& data) const {
     double lightTime = 0.0;
+
+    double time = data.time.j2000Seconds();
+    if (_fixedEphemerisTime.has_value()) {
+        time = *_fixedEphemerisTime;
+    }
     return SpiceManager::ref().targetPosition(
         _cachedTarget,
         _cachedObserver,
         _cachedFrame,
         {},
-        data.time.j2000Seconds(),
+        time,
         lightTime
     ) * 1000.0;
 }
diff --git a/modules/space/translation/spicetranslation.h b/modules/space/translation/spicetranslation.h
index 6b3f78808a..0cbead6eab 100644
--- a/modules/space/translation/spicetranslation.h
+++ b/modules/space/translation/spicetranslation.h
@@ -28,6 +28,7 @@
 #include <openspace/scene/translation.h>
 
 #include <openspace/properties/stringproperty.h>
+#include <optional>
 
 namespace openspace {
 
@@ -43,6 +44,7 @@ private:
     properties::StringProperty _target;
     properties::StringProperty _observer;
     properties::StringProperty _frame;
+    properties::StringProperty _fixedDate;
 
     // We are accessing these values every frame and when retrieving a string from the
     // StringProperty, it allocates some new memory, which we want to prevent. Until the
@@ -51,6 +53,7 @@ private:
     std::string _cachedTarget;
     std::string _cachedObserver;
     std::string _cachedFrame;
+    std::optional<double> _fixedEphemerisTime;
 
     glm::dvec3 _position = glm::dvec3(0.0);
 };
diff --git a/modules/space/translation/tletranslation.cpp b/modules/space/translation/tletranslation.cpp
index 83f5794355..a1e43460ed 100644
--- a/modules/space/translation/tletranslation.cpp
+++ b/modules/space/translation/tletranslation.cpp
@@ -28,6 +28,7 @@
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <chrono>
+#include <filesystem>
 #include <fstream>
 #include <optional>
 #include <vector>
@@ -203,7 +204,7 @@ namespace {
         // mu = G*M_earth
         double period = std::chrono::seconds(std::chrono::hours(24)).count() / meanMotion;
 
-        const double pisq = glm::pi<double>() * glm::pi<double>();
+        constexpr const double pisq = glm::pi<double>() * glm::pi<double>();
         double semiMajorAxis = pow((muEarth * period*period) / (4 * pisq), 1.0 / 3.0);
 
         // We need the semi major axis in km instead of m
@@ -224,9 +225,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation TLETranslation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "space_transform_tle";
-    return doc;
+    return codegen::doc<Parameters>("space_transform_tle");
 }
 
 TLETranslation::TLETranslation(const ghoul::Dictionary& dictionary) {
@@ -238,7 +237,7 @@ TLETranslation::TLETranslation(const ghoul::Dictionary& dictionary) {
 }
 
 void TLETranslation::readTLEFile(const std::string& filename, int lineNum) {
-    ghoul_assert(FileSys.fileExists(filename), "The filename must exist");
+    ghoul_assert(std::filesystem::is_regular_file(filename), "The filename must exist");
 
     std::ifstream file;
     file.exceptions(std::ofstream::failbit | std::ofstream::badbit);
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
index 84debee14f..69a86f3129 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
@@ -39,22 +39,6 @@
 #include <chrono>
 
 namespace {
-    constexpr const char* KeyFontMono = "Mono";
-    constexpr const float DefaultFontSize = 10.f;
-
-    constexpr openspace::properties::Property::PropertyInfo FontNameInfo = {
-        "FontName",
-        "Font Name",
-        "This value is the name of the font that is used. It can either refer to an "
-        "internal name registered previously, or it can refer to a path that is used."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = {
-        "FontSize",
-        "Font Size",
-        "This value determines the size of the font that is used to render the date."
-    };
-
     constexpr openspace::properties::Property::PropertyInfo ActiveColorInfo = {
         "ActiveColor",
         "Active Color",
@@ -89,12 +73,6 @@ namespace {
     }
 
     struct [[codegen::Dictionary(DashboardItemInstruments)]] Parameters {
-        // [[codegen::verbatim(FontNameInfo.description)]]
-        std::optional<std::string> fontName;
-
-        // [[codegen::verbatim(FontSizeInfo.description)]]
-        std::optional<float> fontSize;
-
         // [[codegen::verbatim(ActiveColorInfo.description)]]
         std::optional<glm::dvec3> activeColor [[codegen::color()]];
 
@@ -107,15 +85,11 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItemInstruments::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "spacecraftinstruments_dashboarditem_instuments";
-    return doc;
+    return codegen::doc<Parameters>("spacecraftinstruments_dashboarditem_instuments");
 }
 
 DashboardItemInstruments::DashboardItemInstruments(const ghoul::Dictionary& dictionary)
-    : DashboardItem(dictionary)
-    , _fontName(FontNameInfo, KeyFontMono)
-    , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
+    : DashboardTextItem(dictionary)
     , _activeColor(
         ActiveColorInfo,
         glm::vec3(0.6f, 1.f, 0.f),
@@ -127,28 +101,13 @@ DashboardItemInstruments::DashboardItemInstruments(const ghoul::Dictionary& dict
         glm::vec3(0.f),
         glm::vec3(1.f)
     )
-    , _font(global::fontManager->font(KeyFontMono, 10))
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _fontName = p.fontName.value_or(_fontName);
-    _fontName.onChange([this]() {
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontName);
-
-    _fontSize = p.fontSize.value_or(_fontSize);
-    _fontSize.onChange([this]() {
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontSize);
-
     _activeColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_activeColor);
     _activeFlash.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_activeFlash);
-
-    _font = global::fontManager->font(_fontName, _fontSize);
 }
 
 void DashboardItemInstruments::render(glm::vec2& penPosition) {
@@ -163,14 +122,14 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
 
     penPosition.y -= 25.f;
 
-    glm::vec4 targetColor(0.f, 0.75f, 1.f, 1.f);
+    constexpr const glm::vec4 targetColor(0.f, 0.75f, 1.f, 1.f);
 
+    double previous = sequencer.prevCaptureTime(currentTime);
+    double next = sequencer.nextCaptureTime(currentTime);
     double remaining = sequencer.nextCaptureTime(currentTime) - currentTime;
-    const float t = static_cast<float>(
-        1.0 - remaining / sequencer.intervalLength(currentTime)
-    );
+    const float t = static_cast<float>(1.0 - remaining / (next - previous));
 
-    if (remaining > 0) {
+    if (remaining > 0.0) {
         RenderFont(
             *_font,
             penPosition,
@@ -235,8 +194,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
         *_font,
         penPosition,
         fmt::format(
-            "Next image: [{:02d}:{:02d}:{:02d}]",
-            tlh.count(), tlm.count(), tls.count()
+            "Next image: [{:02d}:{:02d}:{:02d}]", tlh.count(), tlm.count(), tls.count()
         ),
         targetColor,
         ghoul::fontrendering::CrDirection::Down
@@ -247,7 +205,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
     const std::vector<std::pair<std::string, bool>>& activeMap =
         sequencer.activeInstruments(currentTime);
 
-    glm::vec4 firing(0.58f - t, 1.f - t, 1.f - t, 1.f);
+    glm::vec4 firing = glm::vec4(0.58f - t, 1.f - t, 1.f - t, 1.f);
 
     RenderFont(
         *_font,
@@ -286,7 +244,6 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
 
 glm::vec2 DashboardItemInstruments::size() const {
     glm::vec2 size = glm::vec2(0.f);
-    //return ghoul::fontrendering::FontRenderer::defaultRenderer().boundingBox(
     double currentTime = global::timeManager->time().j2000Seconds();
 
     if (!ImageSequencer::ref().isReady()) {
@@ -294,24 +251,20 @@ glm::vec2 DashboardItemInstruments::size() const {
     }
     ImageSequencer& sequencer = ImageSequencer::ref();
 
-    const double remaining = sequencer.nextCaptureTime(currentTime) - currentTime;
-    const float t = static_cast<float>(
-        1.0 - remaining / sequencer.intervalLength(currentTime)
-    );
+    double previous = sequencer.prevCaptureTime(currentTime);
+    double next = sequencer.nextCaptureTime(currentTime);
+    double remaining = sequencer.nextCaptureTime(currentTime) - currentTime;
+    const float t = static_cast<float>(1.0 - remaining / (next - previous));
 
     const std::string& str = SpiceManager::ref().dateFromEphemerisTime(
         sequencer.nextCaptureTime(currentTime),
         "YYYY MON DD HR:MN:SC"
     );
 
-
-    if (remaining > 0) {
+    if (remaining > 0.0) {
         std::string progress = progressToStr(25, t);
 
-        size = addToBoundingbox(
-            size,
-            _font->boundingBox("Next instrument activity:")
-        );
+        size = addToBoundingbox(size, _font->boundingBox("Next instrument activity:"));
 
         size = addToBoundingbox(
             size,
@@ -322,9 +275,7 @@ glm::vec2 DashboardItemInstruments::size() const {
 
         size = addToBoundingbox(
             size,
-            _font->boundingBox(
-                fmt::format("Data acquisition time: {}", str)
-            )
+            _font->boundingBox(fmt::format("Data acquisition time: {}", str))
         );
     }
     std::pair<double, std::string> nextTarget = sequencer.nextTarget(currentTime);
@@ -368,10 +319,7 @@ glm::vec2 DashboardItemInstruments::size() const {
 
     size.y += _font->height();
 
-    size = addToBoundingbox(
-        size,
-        _font->boundingBox("Active Instruments:")
-    );
+    size = addToBoundingbox(size, _font->boundingBox("Active Instruments:"));
     return size;
 }
 
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
index 06be3f5dd9..a08c2b96dc 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
@@ -25,19 +25,15 @@
 #ifndef __OPENSPACE_MODULE_SPACECRAFTINSTRUMENTS___DASHBOARDITEMINSTRUMENTS___H__
 #define __OPENSPACE_MODULE_SPACECRAFTINSTRUMENTS___DASHBOARDITEMINSTRUMENTS___H__
 
-#include <openspace/rendering/dashboarditem.h>
+#include <openspace/rendering/dashboardtextitem.h>
 
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
 
-namespace ghoul::fontrendering { class Font; }
-
 namespace openspace {
 
-namespace documentation { struct Documentation; }
-
-class DashboardItemInstruments : public DashboardItem {
+class DashboardItemInstruments : public DashboardTextItem {
 public:
     DashboardItemInstruments(const ghoul::Dictionary& dictionary);
     ~DashboardItemInstruments() = default;
@@ -49,13 +45,8 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    properties::StringProperty _fontName;
-    properties::FloatProperty _fontSize;
-
     properties::Vec3Property _activeColor;
     properties::Vec3Property _activeFlash;
-
-    std::shared_ptr<ghoul::fontrendering::Font> _font;
 };
 
 } // namespace openspace
diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
index 1ed8bfcddd..f771037e29 100644
--- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
@@ -31,10 +31,8 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
-#include <ghoul/glm.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/opengl/programobject.h>
-#include <optional>
 
 namespace {
     struct VBOData {
@@ -75,9 +73,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableCrawlingLine::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "newhorizons_renderable_crawlingline";
-    return doc;
+    return codegen::doc<Parameters>("newhorizons_renderable_crawlingline");
 }
 
 RenderableCrawlingLine::RenderableCrawlingLine(const ghoul::Dictionary& dictionary)
@@ -120,7 +116,7 @@ void RenderableCrawlingLine::initializeGL() {
         GL_FLOAT,
         GL_FALSE,
         sizeof(VBOData),
-        reinterpret_cast<void*>(offsetof(VBOData, color)) // NOLINT
+        reinterpret_cast<void*>(offsetof(VBOData, color))
     );
 
     glBindVertexArray(0);
@@ -147,8 +143,8 @@ void RenderableCrawlingLine::render(const RenderData& data, RendererTasks&) {
     _frameCounter++;
 
     glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
-        glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
+        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
+        glm::dmat4(data.modelTransform.rotation) *
         glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
 
     glm::dmat4 modelViewProjectionTransform = data.camera.projectionMatrix() *
@@ -162,10 +158,9 @@ void RenderableCrawlingLine::render(const RenderData& data, RendererTasks&) {
 
     glLineWidth(2.f);
 
-    _program->setUniform("_alpha", alpha);
+    _program->setUniform("alpha", alpha);
 
     glBindVertexArray(_vao);
-
     glDrawArrays(GL_LINES, 0, 2);
     glBindVertexArray(0);
 
@@ -204,20 +199,15 @@ void RenderableCrawlingLine::update(const UpdateData& data) {
 
 
     glBindBuffer(GL_ARRAY_BUFFER, _vbo);
-    glBufferSubData(
-        GL_ARRAY_BUFFER,
-        0,
-        2 * sizeof(VBOData),
-        vboData
-    );
+    glBufferSubData(GL_ARRAY_BUFFER, 0, 2 * sizeof(VBOData), vboData);
 
     if (ImageSequencer::ref().isReady()) {
-        _imageSequenceTime = ImageSequencer::ref().instrumentActiveTime(
+        float imageSequenceTime = ImageSequencer::ref().instrumentActiveTime(
             data.time.j2000Seconds(),
             _instrumentName
         );
 
-        _drawLine = _imageSequenceTime != -1.f;
+        _drawLine = (imageSequenceTime != -1.f);
     }
 }
 
diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.h b/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
index 4f9c0a41cb..02c493f896 100644
--- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
+++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
@@ -54,7 +54,6 @@ private:
     std::string _instrumentName;
     std::string _source;
     std::string _target;
-    std::string _referenceFrame;
 
     glm::vec4 _lineColorBegin = glm::vec4(0.f);
     glm::vec4 _lineColorEnd = glm::vec4(0.f);
@@ -62,7 +61,6 @@ private:
     int _frameCounter = 0;
 
     bool _drawLine = false;
-    float _imageSequenceTime = -1.f;
 
     GLuint _vao = 0;
     GLuint _vbo = 0;
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index 30e0753aa5..775abfec35 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -41,13 +41,12 @@ namespace {
     constexpr const char* ProgramName = "FovProgram";
 
     constexpr const std::array<const char*, 9> UniformNames = {
-        "modelViewProjectionTransform", "defaultColorStart", "defaultColorEnd",
+        "modelViewProjectionTransform", "colorStart", "colorEnd",
         "activeColor", "targetInFieldOfViewColor", "intersectionStartColor",
         "intersectionEndColor", "squareColor", "interpolation"
     };
 
     constexpr const int InterpolationSteps = 5;
-
     constexpr const double Epsilon = 1e-4;
 
     constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = {
@@ -57,13 +56,6 @@ namespace {
         "corners of the field of view."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo DrawSolidInfo = {
-        "SolidDraw",
-        "Solid Draw",
-        "This value determines whether the field of view should be rendered as a solid "
-        "or as lines only."
-    };
-
     constexpr openspace::properties::Property::PropertyInfo StandoffDistanceInfo = {
         "StandOffDistance",
         "Standoff Distance Factor",
@@ -145,6 +137,7 @@ namespace {
             return 0.5 * bisect(p1, half, testFunction, half);
         }
     }
+
     // Needs support for std::map first for the frameConversions
     struct [[codegen::Dictionary(RenderableFov)]] Parameters {
         // The SPICE name of the source body for which the field of view should be
@@ -192,42 +185,18 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableFov::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "newhorizons_renderable_fieldofview";
-    return doc;
+    return codegen::doc<Parameters>("newhorizons_renderable_fieldofview");
 }
 
-
 RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _lineWidth(LineWidthInfo, 1.f, 1.f, 20.f)
-    , _drawSolid(DrawSolidInfo, false)
     , _standOffDistance(StandoffDistanceInfo, 0.9999, 0.99, 1.0, 0.000001)
     , _colors({
-        {
-            DefaultStartColorInfo,
-            glm::vec3(0.4f),
-            glm::vec3(0.f),
-            glm::vec3(1.f)
-        },
-        {
-            DefaultEndColorInfo,
-            glm::vec3(0.85f),
-            glm::vec3(0.f),
-            glm::vec3(1.f)
-        },
-        {
-            ActiveColorInfo,
-            glm::vec3(0.f, 1.f, 0.f),
-            glm::vec3(0.f),
-            glm::vec3(1.f)
-        },
-        {
-            TargetInFovInfo,
-            glm::vec3(0.f, 0.5f, 0.7f),
-            glm::vec3(0.f),
-            glm::vec3(1.f)
-        },
+        { DefaultStartColorInfo, glm::vec3(0.4f), glm::vec3(0.f), glm::vec3(1.f) },
+        { DefaultEndColorInfo, glm::vec3(0.85f), glm::vec3(0.f), glm::vec3(1.f) },
+        { ActiveColorInfo, glm::vec3(0.f, 1.f, 0.f), glm::vec3(0.f), glm::vec3(1.f) },
+        { TargetInFovInfo, glm::vec3(0.f, 0.5f, 0.7f), glm::vec3(0.f), glm::vec3(1.f) },
         {
             IntersectionStartInfo,
             glm::vec3(1.f, 0.89f, 0.f),
@@ -240,12 +209,7 @@ RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary)
             glm::vec3(0.f),
             glm::vec3(1.f)
         },
-        {
-            SquareColorInfo,
-            glm::vec3(0.85f),
-            glm::vec3(0.f),
-            glm::vec3(1.f)
-        }
+        { SquareColorInfo, glm::vec3(0.85f), glm::vec3(0.f), glm::vec3(1.f) }
     })
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
@@ -278,8 +242,6 @@ RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary)
     
     _simplifyBounds = p.simplifyBounds.value_or(_simplifyBounds);
 
-    addProperty(_drawSolid);
-
     addProperty(_colors.defaultStart);
     addProperty(_colors.defaultEnd);
     addProperty(_colors.active);
@@ -290,17 +252,16 @@ RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary)
 }
 
 void RenderableFov::initializeGL() {
-    _program =
-        SpacecraftInstrumentsModule::ProgramObjectManager.request(
-            ProgramName,
-            []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
-                return global::renderEngine->buildRenderProgram(
-                    ProgramName,
-                    absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/fov_vs.glsl"),
-                    absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/fov_fs.glsl")
-                );
-            }
-        );
+    _program = SpacecraftInstrumentsModule::ProgramObjectManager.request(
+        ProgramName,
+        []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
+            return global::renderEngine->buildRenderProgram(
+                ProgramName,
+                absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/fov_vs.glsl"),
+                absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/fov_fs.glsl")
+            );
+        }
+    );
 
     ghoul::opengl::updateUniformLocations(*_program, _uniformCache, UniformNames);
 
@@ -402,7 +363,7 @@ void RenderableFov::initializeGL() {
         1,
         GL_INT,
         sizeof(RenderInformation::VBOData),
-        reinterpret_cast<void*>(offsetof(RenderInformation::VBOData, color)) // NOLINT
+        reinterpret_cast<void*>(offsetof(RenderInformation::VBOData, color))
     );
 
     // Orthogonal Plane
@@ -432,7 +393,7 @@ void RenderableFov::initializeGL() {
         1,
         GL_INT,
         sizeof(RenderInformation::VBOData),
-        reinterpret_cast<void*>(offsetof(RenderInformation::VBOData, color)) // NOLINT
+        reinterpret_cast<void*>(offsetof(RenderInformation::VBOData, color))
     );
 
     glBindVertexArray(0);
@@ -478,7 +439,7 @@ glm::dvec3 RenderableFov::orthogonalProjection(const glm::dvec3& vecFov, double
     return p  * 1000.0; // km -> m
 }
 
-void RenderableFov::computeIntercepts(const UpdateData& data, const std::string& target,
+void RenderableFov::computeIntercepts(double time, const std::string& target,
                                       bool isInFov)
 {
     auto makeBodyFixedReferenceFrame =
@@ -488,22 +449,16 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
         if (convert) {
             SpacecraftInstrumentsModule* m =
                 global::moduleEngine->module<SpacecraftInstrumentsModule>();
-            return {
-                m->frameFromBody(target),
-                true
-            };
+            return { m->frameFromBody(target), true };
         }
         else {
             return { ref, false };
         }
     };
 
-    //std::vector<bool> intersects(_instrument.bounds.size());
-
     // First we fill the field-of-view bounds array by testing each bounds vector against
     // the object. We need to test it against the object (rather than using a fixed
-    // distance) as the field of view rendering should stop at the surface and not
-    // continue
+    // distance) as the field of view rendering should stop at the surface
     for (size_t i = 0; i < _instrument.bounds.size(); ++i) {
         const glm::dvec3& bound = _instrument.bounds[i];
 
@@ -517,11 +472,7 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
         if (!isInFov) {
             // If the target is not in the field of view, we don't need to perform any
             // surface intercepts
-            const glm::vec3 o = orthogonalProjection(
-                bound,
-                data.time.j2000Seconds(),
-                target
-            );
+            const glm::vec3 o = orthogonalProjection(bound, time, target);
 
             second = {
                 { o.x, o.y, o.z },
@@ -542,12 +493,10 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
                 _instrument.name,
                 ref.first,
                 _instrument.aberrationCorrection,
-                data.time.j2000Seconds(),
+                time,
                 bound
             );
 
-            //intersects[i] = r.interceptFound;
-
             if (r.interceptFound) {
                 // This point intersected the target
                 first.color = RenderInformation::VertexColorTypeIntersectionStart;
@@ -558,7 +507,7 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
                     r.surfaceVector = SpiceManager::ref().frameTransformationMatrix(
                         ref.first,
                         _instrument.referenceFrame,
-                        data.time.j2000Seconds()
+                        time
                     ) * r.surfaceVector;
                 }
 
@@ -575,11 +524,7 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
             }
             else {
                 // This point did not intersect the target though others did
-                const glm::vec3 o = orthogonalProjection(
-                    bound,
-                    data.time.j2000Seconds(),
-                    target
-                );
+                const glm::vec3 o = orthogonalProjection(bound, time, target);
                 second = {
                     { o.x, o.y, o.z },
                     RenderInformation::VertexColorTypeInFieldOfView
@@ -593,9 +538,7 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
     // earlier
 
     // Each boundary in _instrument.bounds has 'InterpolationSteps' steps between
-    auto indexForBounds = [](size_t idx) -> size_t {
-        return idx * InterpolationSteps;
-    };
+    auto indexForBounds = [](size_t idx) -> size_t { return idx * InterpolationSteps; };
 
     auto copyFieldOfViewValues = [&](size_t iBound, size_t begin, size_t end) -> void {
         std::fill(
@@ -630,7 +573,7 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
                     _instrument.name,
                     makeBodyFixedReferenceFrame(_instrument.referenceFrame).first,
                     _instrument.aberrationCorrection,
-                    data.time.j2000Seconds(),
+                    time,
                     probe
                 ).interceptFound;
             };
@@ -646,7 +589,7 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
                         _instrument.name,
                         ref.first,
                         _instrument.aberrationCorrection,
-                        data.time.j2000Seconds(),
+                        time,
                         probe
                     );
 
@@ -654,7 +597,7 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
                     r.surfaceVector = SpiceManager::ref().frameTransformationMatrix(
                         ref.first,
                         _instrument.referenceFrame,
-                        data.time.j2000Seconds()
+                        time
                     ) * r.surfaceVector;
                 }
 
@@ -675,12 +618,7 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
                     };
                 }
                 else {
-                    const glm::vec3 o = orthogonalProjection(
-                        tBound,
-                        data.time.j2000Seconds(),
-                        target
-                    );
-
+                    const glm::vec3 o = orthogonalProjection(tBound, time, target);
                     _orthogonalPlane.data[indexForBounds(i) + m] = {
                         { o.x, o.y, o.z },
                         RenderInformation::VertexColorTypeSquare
@@ -707,7 +645,7 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
                 _instrument.name,
                 makeBodyFixedReferenceFrame(_instrument.referenceFrame).first,
                 _instrument.aberrationCorrection,
-                data.time,
+                time,
                 probe
             ).interceptFound;
         };
@@ -787,61 +725,52 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
 }
 
 void RenderableFov::render(const RenderData& data, RendererTasks&) {
-    if (_drawFOV) {
-        _program->activate();
-
-        // Model transform and view transform needs to be in double precision
-        glm::dmat4 modelTransform =
-            glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
-            glm::dmat4(data.modelTransform.rotation) *
-            glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
-
-        glm::mat4 modelViewProjectionTransform =
-            data.camera.projectionMatrix() *
-            glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
-
-        _program->setUniform(
-            _uniformCache.modelViewProjection,
-            modelViewProjectionTransform
-        );
-
-        _program->setUniform(_uniformCache.defaultColorStart, _colors.defaultStart);
-        _program->setUniform(_uniformCache.defaultColorEnd, _colors.defaultEnd);
-        _program->setUniform(_uniformCache.activeColor, _colors.active);
-        _program->setUniform(
-            _uniformCache.targetInFieldOfViewColor,
-            _colors.targetInFieldOfView
-        );
-        _program->setUniform(
-            _uniformCache.intersectionStartColor,
-            _colors.intersectionStart
-        );
-        _program->setUniform(
-            _uniformCache.intersectionEndColor,
-            _colors.intersectionEnd
-        );
-        _program->setUniform(_uniformCache.squareColor, _colors.square);
-        _program->setUniform(_uniformCache.interpolation, _interpolationTime);
-
-        GLenum mode = _drawSolid ? GL_TRIANGLE_STRIP : GL_LINES;
-
-        glLineWidth(_lineWidth);
-        glBindVertexArray(_fieldOfViewBounds.vao);
-        glDrawArrays(mode, 0, static_cast<int>(_fieldOfViewBounds.data.size()));
-
-        glLineWidth(2.f);
-        glBindVertexArray(_orthogonalPlane.vao);
-        glDrawArrays(GL_LINE_LOOP, 0, static_cast<int>(_orthogonalPlane.data.size()));
-        glBindVertexArray(0);
-        glLineWidth(1.f);
-
-        _program->deactivate();
+    if (!_drawFOV) {
+        return;
     }
+
+    _program->activate();
+
+    // Model transform and view transform needs to be in double precision
+    glm::dmat4 modelTransform =
+        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
+        glm::dmat4(data.modelTransform.rotation) *
+        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
+
+    glm::mat4 modelViewProjectionTransform =
+        data.camera.projectionMatrix() *
+        glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
+
+    _program->setUniform(_uniformCache.modelViewProjection, modelViewProjectionTransform);
+
+    _program->setUniform(_uniformCache.defaultColorStart, _colors.defaultStart);
+    _program->setUniform(_uniformCache.defaultColorEnd, _colors.defaultEnd);
+    _program->setUniform(_uniformCache.activeColor, _colors.active);
+    _program->setUniform(
+        _uniformCache.targetInFieldOfViewColor,
+        _colors.targetInFieldOfView
+    );
+    _program->setUniform(_uniformCache.intersectionStartColor, _colors.intersectionStart);
+    _program->setUniform(_uniformCache.intersectionEndColor, _colors.intersectionEnd);
+    _program->setUniform(_uniformCache.squareColor, _colors.square);
+    _program->setUniform(_uniformCache.interpolation, _interpolationTime);
+
+    glLineWidth(_lineWidth);
+    glBindVertexArray(_fieldOfViewBounds.vao);
+    glDrawArrays(GL_LINES, 0, static_cast<int>(_fieldOfViewBounds.data.size()));
+
+    glLineWidth(2.f);
+    glBindVertexArray(_orthogonalPlane.vao);
+    glDrawArrays(GL_LINE_LOOP, 0, static_cast<int>(_orthogonalPlane.data.size()));
+    glBindVertexArray(0);
+    glLineWidth(1.f);
+
+    _program->deactivate();
 }
 
 void RenderableFov::update(const UpdateData& data) {
     _drawFOV = false;
-    if (openspace::ImageSequencer::ref().isReady()) {
+    if (ImageSequencer::ref().isReady()) {
         _drawFOV = ImageSequencer::ref().isInstrumentActive(
             data.time.j2000Seconds(),
             _instrument.name
@@ -852,7 +781,7 @@ void RenderableFov::update(const UpdateData& data) {
     if (_drawFOV /* && time changed */) {
         const std::pair<std::string, bool>& t = determineTarget(data.time.j2000Seconds());
 
-        computeIntercepts(data, t.first, t.second);
+        computeIntercepts(data.time.j2000Seconds(), t.first, t.second);
         updateGPU();
 
         const double t2 = ImageSequencer::ref().nextCaptureTime(data.time.j2000Seconds());
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.h b/modules/spacecraftinstruments/rendering/renderablefov.h
index 25bda493d7..6ae7fe6513 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.h
+++ b/modules/spacecraftinstruments/rendering/renderablefov.h
@@ -64,48 +64,26 @@ private:
     // the potential targets are returns the first name of the target that is in field of
     // view, the previous target, or the closest target to the space craft. The second
     // return value is whether the target is currently in the field of view
-    std::pair<std::string,bool> determineTarget(double time);
+    std::pair<std::string, bool> determineTarget(double time);
 
     void updateGPU();
-    void insertPoint(std::vector<float>& arr, glm::vec4 p, glm::vec4 c);
 
-    glm::vec3 squareColor(float t) const {
-        return _colors.active.value() * t + _colors.square.value() * (1 - t);
-    }
-
-    glm::vec3 endColor(float t) const {
-        return _colors.active.value() * t + _colors.intersectionEnd.value() * (1 - t);
-    }
-
-    glm::vec3 fovColor(float t) const {
-        return _colors.active.value() * t + _colors.targetInFieldOfView.value() * (1 - t);
-    }
-
-    void computeIntercepts(const UpdateData& data, const std::string& target,
+    void computeIntercepts(double time, const std::string& target,
         bool isInFov);
 
     glm::dvec3 orthogonalProjection(const glm::dvec3& vecFov, double time,
         const std::string& target) const;
-    glm::dvec3 checkForIntercept(const glm::dvec3& ray, double time,
-        const std::string& target) const;
 
     // properties
     properties::FloatProperty _lineWidth;
-    properties::BoolProperty _drawSolid;
     properties::DoubleProperty _standOffDistance;
     ghoul::opengl::ProgramObject* _program = nullptr;
     UniformCache(modelViewProjection, defaultColorStart, defaultColorEnd, activeColor,
         targetInFieldOfViewColor, intersectionStartColor, intersectionEndColor,
         squareColor, interpolation) _uniformCache;
 
-    // instance variables
-    bool _rebuild = false;
-
     bool _simplifyBounds = false;
 
-    //std::vector<float> _fovBounds;
-    //std::vector<float> _fovPlane;
-
     std::string _previousTarget;
     bool _drawFOV = false;
 
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 376e7c509d..aa54052e7c 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -24,44 +24,32 @@
 
 #include <modules/spacecraftinstruments/rendering/renderablemodelprojection.h>
 
+#include <modules/spacecraftinstruments/util/imagesequencer.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/scene.h>
-#include <openspace/util/spicemanager.h>
-#include <openspace/util/time.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/io/model/modelgeometry.h>
 #include <ghoul/io/model/modelreader.h>
-#include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
-#include <modules/spacecraftinstruments/util/imagesequencer.h>
-#include <filesystem>
-#include <optional>
 
 namespace {
     constexpr const char* _loggerCat = "RenderableModelProjection";
 
-    constexpr const char* KeyGeomModelFile = "GeometryFile";
-    constexpr const char* keyProjection = "Projection";
-    constexpr const char* keyBoundingSphereRadius = "BoundingSphereRadius";
-
     constexpr const char* DestinationFrame = "GALACTIC";
 
     constexpr const std::array<const char*, 7> MainUniformNames = {
-        "_performShading", "directionToSunViewSpace", "modelViewTransform",
-        "projectionTransform", "_projectionFading", "baseTexture", "projectionTexture"
+        "performShading", "directionToSunViewSpace", "modelViewTransform",
+        "projectionTransform", "projectionFading", "baseTexture", "projectionTexture"
     };
 
-    constexpr const std::array<const char*, 5> FboUniformNames = {
-        "projectionTexture", "needShadowMap", "ProjectorMatrix", "ModelTransform",
-        "boresight"
+    constexpr const std::array<const char*, 6> FboUniformNames = {
+        "projectionTexture", "depthTexture", "needShadowMap", "ProjectorMatrix",
+        "ModelTransform", "boresight"
     };
 
     constexpr const std::array<const char*, 2> DepthFboUniformNames = {
@@ -84,7 +72,8 @@ namespace {
         std::filesystem::path geometryFile;
 
         // Contains information about projecting onto this planet.
-        ghoul::Dictionary projection [[codegen::reference("newhorizons_projectioncomponent")]];
+        ghoul::Dictionary projection
+            [[codegen::reference("newhorizons_projectioncomponent")]];
 
         // [[codegen::verbatim(PerformShadingInfo.description)]]
         std::optional<bool> performShading;
@@ -101,9 +90,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableModelProjection::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "newhorizons_renderable_modelprojection";
-    return doc;
+    return codegen::doc<Parameters>("newhorizons_renderable_modelprojection");
 }
 
 RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& dictionary)
@@ -112,25 +99,20 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
 {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    std::string file = absPath(p.geometryFile.string());
+    std::filesystem::path file = absPath(p.geometryFile.string());
     _geometry = ghoul::io::ModelReader::ref().loadModel(
-        file,
+        file.string(),
         ghoul::io::ModelReader::ForceRenderInvisible::No,
         ghoul::io::ModelReader::NotifyInvisibleDropped::Yes
     );
 
     addPropertySubOwner(_projectionComponent);
-
-    _projectionComponent.initialize(
-        identifier(),
-        p.projection
-    );
+    _projectionComponent.initialize(identifier(), p.projection);
 
     double boundingSphereRadius = p.boundingSphereRadius.value_or(1.0e9);
     setBoundingSphere(boundingSphereRadius);
 
     _performShading = p.performShading.value_or(_performShading);
-
     addProperty(_performShading);
 }
 
@@ -183,7 +165,7 @@ void RenderableModelProjection::initializeGL() {
 
     _projectionComponent.initializeGL();
 
-    float bs = boundingSphere();
+    double bs = boundingSphere();
     _geometry->initialize();
     setBoundingSphere(bs); // ignore bounding sphere set by geometry.
 }
@@ -210,33 +192,46 @@ void RenderableModelProjection::render(const RenderData& data, RendererTasks&) {
         _projectionComponent.clearAllProjections();
     }
 
-    _up = data.camera.lookUpVectorCameraSpace();
+    glm::vec3 up = data.camera.lookUpVectorCameraSpace();
 
     if (_shouldCapture && _projectionComponent.doesPerformProjection()) {
-        project();
+        for (const Image& i : _imageTimes) {
+            try {
+                glm::mat4 projectorMatrix = attitudeParameters(i.timeRange.start, up);
+                std::shared_ptr<ghoul::opengl::Texture> t =
+                    _projectionComponent.loadProjectionTexture(i.path, i.isPlaceholder);
+                imageProjectGPU(*t, projectorMatrix);
+            }
+            catch (const SpiceManager::SpiceException& e) {
+                LERRORC(e.component, e.what());
+            }
+        }
+        _shouldCapture = false;
     }
 
     _programObject->activate();
 
-    attitudeParameters(_time);
+    try {
+        attitudeParameters(data.time.j2000Seconds(), up);
+    }
+    catch (const SpiceManager::SpiceException& e) {
+        LERRORC(e.component, e.what());
+    }
     _imageTimes.clear();
 
     // Calculate variables to be used as uniform variables in shader
-    const glm::dvec3 bodyPosition = data.modelTransform.translation;
+    const glm::vec3 bodyPos = data.modelTransform.translation;
 
     // Model transform and view transform needs to be in double precision
-    const glm::dmat4 modelTransform =
-        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
-        glm::dmat4(data.modelTransform.rotation) * // Rotation
-        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)); // Scale
-    const glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() *
-                                          modelTransform;
-    const glm::vec3 directionToSun = glm::normalize(
-        _sunPosition - glm::vec3(bodyPosition)
+    const glm::dmat4 transform =
+        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
+        glm::dmat4(data.modelTransform.rotation) *
+        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
+    const glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * transform;
+    const glm::vec3 directionToSun = glm::normalize(_sunPosition - bodyPos);
+    const glm::vec3 directionToSunViewSpace = glm::normalize(
+        glm::mat3(data.camera.combinedViewMatrix()) * directionToSun
     );
-    const glm::vec3 directionToSunViewSpace = glm::normalize(glm::mat3(
-        data.camera.combinedViewMatrix()
-    ) * directionToSun);
 
     _programObject->setUniform(_mainUniformCache.performShading, _performShading);
     _programObject->setUniform(
@@ -307,18 +302,16 @@ void RenderableModelProjection::update(const UpdateData& data) {
     const double integrateFromTime = data.previousFrameTime.j2000Seconds();
 
     // Only project new images if time changed since last update.
-    if (time > integrateFromTime) {
-        if (ImageSequencer::ref().isReady()) {
-            if (_projectionComponent.doesPerformProjection()) {
-                _shouldCapture = ImageSequencer::ref().imagePaths(
-                    _imageTimes,
-                    _projectionComponent.projecteeId(),
-                    _projectionComponent.instrumentId(),
-                    time,
-                    integrateFromTime
-                );
-            }
-        }
+    if (time > integrateFromTime && ImageSequencer::ref().isReady() &&
+        _projectionComponent.doesPerformProjection())
+    {
+        _imageTimes = ImageSequencer::ref().imagePaths(
+            _projectionComponent.projecteeId(),
+            _projectionComponent.instrumentId(),
+            time,
+            integrateFromTime
+        );
+        _shouldCapture = !_imageTimes.empty();
     }
 
     glm::dmat3 stateMatrix = data.modelTransform.rotation;
@@ -336,14 +329,15 @@ void RenderableModelProjection::update(const UpdateData& data) {
 }
 
 void RenderableModelProjection::imageProjectGPU(
-                                          const ghoul::opengl::Texture& projectionTexture)
+                                          const ghoul::opengl::Texture& projectionTexture,
+                                                         const glm::mat4& projectorMatrix)
 {
     if (_projectionComponent.needsShadowMap()) {
         _projectionComponent.depthMapRenderBegin();
         _depthFboProgramObject->activate();
         _depthFboProgramObject->setUniform(
             _depthFboUniformCache.ProjectorMatrix,
-            _projectorMatrix
+            projectorMatrix
         );
         _depthFboProgramObject->setUniform(
             _depthFboUniformCache.ModelTransform,
@@ -373,36 +367,31 @@ void RenderableModelProjection::imageProjectGPU(
     if (_projectionComponent.needsShadowMap()) {
         unitDepthFbo.activate();
         _projectionComponent.depthTexture().bind();
-        _fboProgramObject->setUniform("depthTexture", unitDepthFbo);
+        _fboProgramObject->setUniform(_fboUniformCache.depthTexture, unitDepthFbo);
     }
 
-    _fboProgramObject->setUniform(_fboUniformCache.ProjectorMatrix, _projectorMatrix);
+    _fboProgramObject->setUniform(_fboUniformCache.ProjectorMatrix, projectorMatrix);
     _fboProgramObject->setUniform(_fboUniformCache.ModelTransform, _transform);
     _fboProgramObject->setUniform(_fboUniformCache.boresight, _boresight);
 
     _geometry->render(*_fboProgramObject, false);
 
     _fboProgramObject->deactivate();
-
     _projectionComponent.imageProjectEnd();
 }
 
-void RenderableModelProjection::attitudeParameters(double time) {
-    try {
-        _instrumentMatrix = SpiceManager::ref().positionTransformMatrix(
-            _projectionComponent.instrumentId(),
-            DestinationFrame,
-            time
-        );
+glm::mat4 RenderableModelProjection::attitudeParameters(double time, const glm::vec3& up)
+{
+    _instrumentMatrix = SpiceManager::ref().positionTransformMatrix(
+        _projectionComponent.instrumentId(),
+        DestinationFrame,
+        time
+    );
 
-        SpiceManager::FieldOfViewResult res = SpiceManager::ref().fieldOfView(
-            _projectionComponent.instrumentId()
-        );
-        _boresight = std::move(res.boresightVector);
-    }
-    catch (const SpiceManager::SpiceException&) {
-        return;
-    }
+    SpiceManager::FieldOfViewResult res = SpiceManager::ref().fieldOfView(
+        _projectionComponent.instrumentId()
+    );
+    _boresight = std::move(res.boresightVector);
 
     double lightTime;
     const glm::dvec3 p = SpiceManager::ref().targetPosition(
@@ -418,11 +407,10 @@ void RenderableModelProjection::attitudeParameters(double time) {
 
     const float distance = glm::length(cpos);
     const double radius = boundingSphere();
-
-    _projectorMatrix = _projectionComponent.computeProjectorMatrix(
+    return _projectionComponent.computeProjectorMatrix(
         cpos,
         _boresight,
-        _up,
+        up,
         _instrumentMatrix,
         _projectionComponent.fieldOfViewY(),
         _projectionComponent.aspectRatio(),
@@ -432,14 +420,4 @@ void RenderableModelProjection::attitudeParameters(double time) {
     );
 }
 
-void RenderableModelProjection::project() {
-    for (const Image& img : _imageTimes) {
-        attitudeParameters(img.timeRange.start);
-        std::shared_ptr<ghoul::opengl::Texture> projTexture =
-            _projectionComponent.loadProjectionTexture(img.path, img.isPlaceholder);
-        imageProjectGPU(*projTexture);
-    }
-    _shouldCapture = false;
-}
-
 }  // namespace openspace
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
index 85027bd997..85a66483c6 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
@@ -66,10 +66,9 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    void attitudeParameters(double time);
-    void imageProjectGPU(const ghoul::opengl::Texture& projectionTexture);
-
-    void project();
+    glm::mat4 attitudeParameters(double time, const glm::vec3& up);
+    void imageProjectGPU(const ghoul::opengl::Texture& projectionTexture,
+        const glm::mat4& projectorMatrix);
 
     ProjectionComponent _projectionComponent;
 
@@ -79,8 +78,8 @@ private:
         projectionTexture) _mainUniformCache;
 
     std::unique_ptr<ghoul::opengl::ProgramObject> _fboProgramObject;
-    UniformCache(projectionTexture, needShadowMap, ProjectorMatrix, ModelTransform,
-        boresight) _fboUniformCache;
+    UniformCache(projectionTexture, depthTexture, needShadowMap, ProjectorMatrix,
+        ModelTransform, boresight) _fboUniformCache;
     std::unique_ptr<ghoul::opengl::ProgramObject> _depthFboProgramObject;
     UniformCache(ProjectorMatrix, ModelTransform) _depthFboUniformCache;
 
@@ -89,13 +88,10 @@ private:
     glm::dmat3 _instrumentMatrix = glm::dmat3(1.0);
 
     // uniforms
-    glm::vec3 _up = glm::vec3(0.f);
     glm::mat4 _transform = glm::mat4(1.f);
-    glm::mat4 _projectorMatrix = glm::mat4(1.f);
     glm::vec3 _boresight = glm::vec3(0.f);
 
     std::vector<Image> _imageTimes;
-    double _time = -std::numeric_limits<double>::max();
 
     bool _shouldCapture = false;
 
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
index be21ff31a0..3a442112c9 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
@@ -30,7 +30,6 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/scene.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
@@ -41,7 +40,6 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <glm/gtx/projection.hpp>
-#include <optional>
 
 namespace {
     constexpr const char* _loggerCat = "RenderablePlaneProjection";
@@ -71,7 +69,7 @@ RenderablePlaneProjection::RenderablePlaneProjection(const ghoul::Dictionary& di
     _defaultTarget = p.defaultTarget.value_or(_defaultTarget);
 
     if (p.texture.has_value()) {
-        _texturePath = absPath(*p.texture);
+        _texturePath = absPath(*p.texture).string();
         _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath);
     }
 }
@@ -124,10 +122,10 @@ void RenderablePlaneProjection::render(const RenderData& data, RendererTasks&) {
     glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
         glm::dmat4(_stateMatrix);
-    glm::mat4 modelViewProjectionTransform = data.camera.projectionMatrix() *
-                             glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
+    glm::mat4 mvp = data.camera.projectionMatrix() *
+                    glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
 
-    _shader->setUniform("modelViewProjectionTransform", modelViewProjectionTransform);
+    _shader->setUniform("modelViewProjectionTransform", mvp);
 
     ghoul::opengl::TextureUnit unit;
     unit.activate();
@@ -142,9 +140,7 @@ void RenderablePlaneProjection::render(const RenderData& data, RendererTasks&) {
 
 void RenderablePlaneProjection::update(const UpdateData& data) {
     const double time = data.time.j2000Seconds();
-    const Image& img = openspace::ImageSequencer::ref().latestImageForInstrument(
-        _instrument
-    );
+    const Image& img = ImageSequencer::ref().latestImageForInstrument(_instrument);
 
     if (img.path.empty()) {
         return;
@@ -163,8 +159,7 @@ void RenderablePlaneProjection::update(const UpdateData& data) {
     if (_moving || _planeIsDirty) {
         updatePlane(img, time);
     }
-
-    else if (timePast > DBL_EPSILON) {
+    else if (timePast > std::numeric_limits<double>::epsilon()) {
         _previousTime = img.timeRange.start;
         updatePlane(img, img.timeRange.start);
     }
@@ -180,27 +175,27 @@ void RenderablePlaneProjection::update(const UpdateData& data) {
 }
 
 void RenderablePlaneProjection::loadTexture() {
-    if (!_texturePath.empty()) {
-        using TR = ghoul::io::TextureReader;
-        std::unique_ptr<ghoul::opengl::Texture> texture = TR::ref().loadTexture(
-            absPath(_texturePath)
-        );
-        if (texture) {
-            if (texture->format() == ghoul::opengl::Texture::Format::Red) {
-                texture->setSwizzleMask({ GL_RED, GL_RED, GL_RED, GL_ONE });
-            }
-            texture->uploadTexture();
-            // TODO: AnisotropicMipMap crashes on ATI cards ---abock
-            //texture->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
-            texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
-            _texture = std::move(texture);
-
-            _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath);
-            _textureFile->setCallback(
-                [&](const ghoul::filesystem::File&) { _textureIsDirty = true; }
-            );
-        }
+    if (_texturePath.empty()) {
+        return;
     }
+
+    std::unique_ptr<ghoul::opengl::Texture> texture =
+        ghoul::io::TextureReader::ref().loadTexture(absPath(_texturePath).string());
+    if (!texture) {
+        return;
+    }
+
+    if (texture->format() == ghoul::opengl::Texture::Format::Red) {
+        texture->setSwizzleMask({ GL_RED, GL_RED, GL_RED, GL_ONE });
+    }
+    texture->uploadTexture();
+    // TODO: AnisotropicMipMap crashes on ATI cards ---abock
+    //texture->setFilter(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
+    texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
+    _texture = std::move(texture);
+
+    _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath);
+    _textureFile->setCallback([this]() { _textureIsDirty = true; });
 }
 
 void RenderablePlaneProjection::updatePlane(const Image& img, double currentTime) {
@@ -235,8 +230,8 @@ void RenderablePlaneProjection::updatePlane(const Image& img, double currentTime
     );
     // The apparent position, CN+S, makes image align best with target
 
-    glm::dvec3 projection[4];
-    std::fill(std::begin(projection), std::end(projection), glm::dvec3(0.0));
+    glm::vec3 projection[4];
+    std::fill(std::begin(projection), std::end(projection), glm::vec3(0.f));
     for (size_t j = 0; j < bounds.size(); ++j) {
         bounds[j] = SpiceManager::ref().frameTransformationMatrix(
             frame,
@@ -255,40 +250,33 @@ void RenderablePlaneProjection::updatePlane(const Image& img, double currentTime
         ) * cornerPosition;
 
         // km -> m
-        projection[j] = cornerPosition * 1000.0;
+        projection[j] = glm::vec3(cornerPosition * 1000.0);
     }
 
     if (!_moving) {
-        SceneGraphNode* thisNode = global::renderEngine->scene()->sceneGraphNode(_name);
-        SceneGraphNode* newParent = global::renderEngine->scene()->sceneGraphNode(
-            _target.node
-        );
+        Scene* scene = global::renderEngine->scene();
+        SceneGraphNode* thisNode = scene->sceneGraphNode(_name);
+        SceneGraphNode* newParent = scene->sceneGraphNode(_target.node);
         if (thisNode && newParent) {
             thisNode->setParent(*newParent);
         }
     }
 
-    glm::vec3 p[4] = {
-        glm::vec3(projection[0]),
-        glm::vec3(projection[1]),
-        glm::vec3(projection[2]),
-        glm::vec3(projection[3])
-    };
     const GLfloat vertex_data[] = {
         // square of two triangles drawn within fov in target coordinates
         //      x      y     z     w     s     t
         // Lower left 1
-        p[1].x, p[1].y, p[1].z, 0.f, 0.f, 0.f,
+        projection[1].x, projection[1].y, projection[1].z, 0.f, 0.f, 0.f,
         // Upper right 2
-        p[3].x, p[3].y, p[3].z, 0.f, 1.f, 1.f,
+        projection[3].x, projection[3].y, projection[3].z, 0.f, 1.f, 1.f,
         // Upper left 3
-        p[2].x, p[2].y, p[2].z, 0.f, 0.f, 1.f,
+        projection[2].x, projection[2].y, projection[2].z, 0.f, 0.f, 1.f,
         // Lower left 4 = 1
-        p[1].x, p[1].y, p[1].z, 0.f, 0.f, 0.f,
+        projection[1].x, projection[1].y, projection[1].z, 0.f, 0.f, 0.f,
         // Lower right 5
-        p[0].x, p[0].y, p[0].z, 0.f, 1.f, 0.f,
+        projection[0].x, projection[0].y, projection[0].z, 0.f, 1.f, 0.f,
         // Upper left 6 = 2
-        p[3].x, p[3].y, p[3].z, 0.f, 1.f, 1.f,
+        projection[3].x, projection[3].y, projection[3].z, 0.f, 1.f, 1.f,
     };
 
     glBindVertexArray(_quad);
@@ -302,7 +290,7 @@ void RenderablePlaneProjection::updatePlane(const Image& img, double currentTime
         2,
         GL_FLOAT,
         GL_FALSE,
-        sizeof(GLfloat) * 6,
+        6 * sizeof(GLfloat),
         reinterpret_cast<void*>(sizeof(GLfloat) * 4)
     );
 
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
index d4d72f0ab8..4b84eaebda 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
@@ -71,7 +71,6 @@ private:
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
     bool _textureIsDirty = false;
     std::unique_ptr<ghoul::opengl::Texture> _texture;
-//    ghoul::opengl::Texture* _texture;
     std::unique_ptr<ghoul::filesystem::File> _textureFile;
     GLuint _quad = 0;
     GLuint _vertexPositionBuffer = 0;
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index 147ce0c659..6be4be39c5 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -26,20 +26,17 @@
 
 #include <modules/space/rendering/planetgeometry.h>
 #include <modules/spacecraftinstruments/spacecraftinstrumentsmodule.h>
+#include <modules/spacecraftinstruments/util/image.h>
 #include <modules/spacecraftinstruments/util/imagesequencer.h>
 #include <openspace/documentation/documentation.h>
-#include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/io/texture/texturereader.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureconversion.h>
 #include <ghoul/opengl/textureunit.h>
-#include <optional>
 
 namespace {
     constexpr const char* _loggerCat = "RenderablePlanetProjection";
@@ -47,19 +44,18 @@ namespace {
     constexpr const char* FBOPassProgramName = "FBOPassProgram";
 
     constexpr const std::array<const char*, 12> MainUniformNames = {
-        "sun_pos", "modelTransform", "modelViewProjectionTransform", "_hasBaseMap",
-        "_hasHeightMap", "_heightExaggeration", "_meridianShift", "_ambientBrightness",
-        "_projectionFading", "baseTexture", "projectionTexture", "heightTexture"
+        "sun_pos", "modelTransform", "modelViewProjectionTransform", "hasBaseMap",
+        "hasHeightMap", "heightExaggeration", "meridianShift", "ambientBrightness",
+        "projectionFading", "baseTexture", "projectionTexture", "heightTexture"
     };
 
-    constexpr const std::array<const char*, 7> FboUniformNames = {
-        "projectionTexture", "ProjectorMatrix", "ModelTransform", "_scaling",
-        "boresight", "_radius", "_segments"
+    constexpr const std::array<const char*, 6> FboUniformNames = {
+        "projectionTexture", "ProjectorMatrix", "ModelTransform", 
+        "boresight", "radius", "segments"
     };
 
     constexpr const char* KeyRadius = "Geometry.Radius";
-    constexpr const char* _mainFrame = "GALACTIC";
-
+    constexpr const char* MainFrame = "GALACTIC";
     constexpr const char* NoImageText = "No Image";
 
     constexpr openspace::properties::Property::PropertyInfo ColorTexturePathsInfo = {
@@ -133,7 +129,7 @@ namespace {
         "Clear Projection Buffer",
         "Remove all pending projections from the buffer"
     };
-    
+
     struct [[codegen::Dictionary(RenderablePlanetProjection)]] Parameters {
         // The geometry that is used for rendering this planet
         ghoul::Dictionary geometry [[codegen::reference("space_geometry_planet")]];
@@ -166,9 +162,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderablePlanetProjection::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "newhorizons_renderable_planetprojection";
-    return doc;
+    return codegen::doc<Parameters>("newhorizons_renderable_planetprojection");
 }
 
 RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary& dict)
@@ -177,10 +171,10 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary&
     , _addColorTexturePath(AddColorTextureInfo)
     , _heightMapTexturePaths(HeightTexturePathsInfo)
     , _addHeightMapTexturePath(AddHeightTextureInfo)
-    , _heightExaggeration(HeightExaggerationInfo, 1.f, 0.f, 1e6f, 1.f, 3.f)
+    , _heightExaggeration(HeightExaggerationInfo, 1.f, 0.f, 1e6f, 1.f)
     , _meridianShift(MeridianShiftInfo, false)
     , _ambientBrightness(AmbientBrightnessInfo, 0.075f, 0.f, 1.f)
-    , _maxProjectionsPerFrame(MaxProjectionsPerFrameInfo, 1, 1, 64)
+    , _maxProjectionsPerFrame(MaxProjectionsPerFrameInfo, 3, 1, 64)
     , _projectionsInBuffer(ProjectionsInBufferInfo, 0, 1, 32)
     , _clearProjectionBuffer(ClearProjectionBufferInfo)
 {
@@ -199,29 +193,23 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary&
             t
         );
     }
-    _colorTexturePaths = static_cast<int>(
-        _colorTexturePaths.options().size() - 1
-    );
+    _colorTexturePaths = static_cast<int>(_colorTexturePaths.options().size() - 1);
 
     _addColorTexturePath.onChange([this]() {
-        if (!_addColorTexturePath.value().empty()) {
-            _colorTexturePaths.addOption(
-                // as we started with 0, this works
-                static_cast<int>(_colorTexturePaths.options().size()),
-                _addColorTexturePath.value()
-            );
-
-            _colorTexturePaths = static_cast<int>(
-                _colorTexturePaths.options().size() - 1
-            );
-
-            _addColorTexturePath = "";
+        if (_addColorTexturePath.value().empty()) {
+            return;
         }
+        _colorTexturePaths.addOption(
+            // as we started with 0, this works
+            static_cast<int>(_colorTexturePaths.options().size()),
+            _addColorTexturePath.value()
+        );
+
+        _colorTexturePaths = static_cast<int>(_colorTexturePaths.options().size() - 1);
+        _addColorTexturePath = "";
     });
     addProperty(_addColorTexturePath);
 
-
-
     _heightMapTexturePaths.addOption(0, NoImageText);
     _heightMapTexturePaths.onChange([this]() { _heightMapTextureDirty = true; });
     addProperty(_heightMapTexturePaths);
@@ -266,16 +254,16 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary&
     addPropertySubOwner(_geometry.get());
     addPropertySubOwner(_projectionComponent);
 
+    _heightExaggeration.setExponent(3.f);
     _heightExaggeration = p.heightExaggeration.value_or(_heightExaggeration);
     addProperty(_heightExaggeration);
-    
+
     _maxProjectionsPerFrame = p.maxProjectionsPerFrame.value_or(_maxProjectionsPerFrame);
     addProperty(_maxProjectionsPerFrame);
 
     addProperty(_ambientBrightness);
     addProperty(_projectionsInBuffer);
 
-
     _clearProjectionBuffer.onChange([this]() {
         _imageTimes.clear();
         _projectionsInBuffer = static_cast<int>(_imageTimes.size());
@@ -287,21 +275,20 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary&
 RenderablePlanetProjection::~RenderablePlanetProjection() {} // NOLINT
 
 void RenderablePlanetProjection::initializeGL() {
-    _programObject =
-        SpacecraftInstrumentsModule::ProgramObjectManager.request(
-            ProjectiveProgramName,
-            []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
-                return global::renderEngine->buildRenderProgram(
-                    ProjectiveProgramName,
-                    absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/"
-                            "renderablePlanet_vs.glsl"
-                    ),
-                    absPath("${MODULE_SPACECRAFTINSTRUMENTS}/shaders/"
-                            "renderablePlanet_fs.glsl"
-                    )
-                );
-            }
-        );
+    _programObject = SpacecraftInstrumentsModule::ProgramObjectManager.request(
+        ProjectiveProgramName,
+        []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
+            return global::renderEngine->buildRenderProgram(
+                ProjectiveProgramName,
+                absPath(
+                    "${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderablePlanet_vs.glsl"
+                ),
+                absPath(
+                    "${MODULE_SPACECRAFTINSTRUMENTS}/shaders/renderablePlanet_fs.glsl"
+                )
+            );
+        }
+    );
 
     ghoul::opengl::updateUniformLocations(
         *_programObject,
@@ -309,23 +296,22 @@ void RenderablePlanetProjection::initializeGL() {
         MainUniformNames
     );
 
-    _fboProgramObject =
-        SpacecraftInstrumentsModule::ProgramObjectManager.request(
-            FBOPassProgramName,
-            []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
-                return ghoul::opengl::ProgramObject::Build(
-                    FBOPassProgramName,
-                        absPath(
-                            "${MODULE_SPACECRAFTINSTRUMENTS}/shaders/"
-                            "renderablePlanetProjection_vs.glsl"
-                        ),
-                        absPath(
-                            "${MODULE_SPACECRAFTINSTRUMENTS}/shaders/"
-                            "renderablePlanetProjection_fs.glsl"
-                        )
-                );
-            }
-        );
+    _fboProgramObject = SpacecraftInstrumentsModule::ProgramObjectManager.request(
+        FBOPassProgramName,
+        []() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
+            return ghoul::opengl::ProgramObject::Build(
+                FBOPassProgramName,
+                    absPath(
+                        "${MODULE_SPACECRAFTINSTRUMENTS}/shaders/"
+                        "renderablePlanetProjection_vs.glsl"
+                    ),
+                    absPath(
+                        "${MODULE_SPACECRAFTINSTRUMENTS}/shaders/"
+                        "renderablePlanetProjection_fs.glsl"
+                    )
+            );
+        }
+    );
 
     ghoul::opengl::updateUniformLocations(
         *_fboProgramObject,
@@ -339,7 +325,6 @@ void RenderablePlanetProjection::initializeGL() {
     _geometry->initialize();
     setBoundingSphere(_geometry->boundingSphere());
 
-    //completeSuccess &= auxiliaryRendertarget();
     // SCREEN-QUAD
     const GLfloat vertexData[] = {
         -1.f, -1.f,
@@ -356,17 +341,7 @@ void RenderablePlanetProjection::initializeGL() {
     glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
     glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData, GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 2, nullptr);
-    // glEnableVertexAttribArray(1);
-    // glVertexAttribPointer(
-    //     1,
-    //     2,
-    //     GL_FLOAT,
-    //     GL_FALSE,
-    //     sizeof(GLfloat) * 2,
-    //     reinterpret_cast<void*>(sizeof(GLfloat) * 4)
-    // );
-
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
     glBindVertexArray(0);
 }
 
@@ -386,9 +361,7 @@ void RenderablePlanetProjection::deinitializeGL() {
     );
     _programObject = nullptr;
 
-    SpacecraftInstrumentsModule::ProgramObjectManager.release(
-        FBOPassProgramName
-    );
+    SpacecraftInstrumentsModule::ProgramObjectManager.release(FBOPassProgramName);
     _fboProgramObject = nullptr;
 }
 
@@ -397,7 +370,8 @@ bool RenderablePlanetProjection::isReady() const {
 }
 
 void RenderablePlanetProjection::imageProjectGPU(
-                                          const ghoul::opengl::Texture& projectionTexture)
+                                          const ghoul::opengl::Texture& projectionTexture,
+                                                         const glm::mat4& projectorMatrix)
 {
     _projectionComponent.imageProjectBegin();
 
@@ -408,9 +382,8 @@ void RenderablePlanetProjection::imageProjectGPU(
     projectionTexture.bind();
     _fboProgramObject->setUniform(_fboUniformCache.projectionTexture, unitFbo);
 
-    _fboProgramObject->setUniform(_fboUniformCache.projectorMatrix, _projectorMatrix);
+    _fboProgramObject->setUniform(_fboUniformCache.projectorMatrix, projectorMatrix);
     _fboProgramObject->setUniform(_fboUniformCache.modelTransform, _transform);
-    _fboProgramObject->setUniform(_fboUniformCache.scaling, _camScaling);
     _fboProgramObject->setUniform(_fboUniformCache.boresight, _boresight);
 
     if (_geometry->hasProperty("Radius")) {
@@ -437,33 +410,27 @@ void RenderablePlanetProjection::imageProjectGPU(
     _fboProgramObject->deactivate();
 
     _projectionComponent.imageProjectEnd();
+    glBindVertexArray(0);
 }
 
-void RenderablePlanetProjection::attitudeParameters(double time) {
+glm::mat4 RenderablePlanetProjection::attitudeParameters(double time, const glm::vec3& up)
+{
     // precomputations for shader
-    _instrumentMatrix = SpiceManager::ref().positionTransformMatrix(
-        _projectionComponent.instrumentId(), _mainFrame, time
+    glm::dmat3 instrumentMatrix = SpiceManager::ref().positionTransformMatrix(
+        _projectionComponent.instrumentId(),
+        MainFrame,
+        time
     );
 
-    _transform = glm::mat4(_stateMatrix);
-
-    glm::dvec3 bs = glm::dvec3(0.0);
-    try {
-        SpiceManager::FieldOfViewResult res = SpiceManager::ref().fieldOfView(
-            _projectionComponent.instrumentId()
-        );
-        bs = std::move(res.boresightVector);
-    }
-    catch (const SpiceManager::SpiceException& e) {
-        LERRORC(e.component, e.what());
-        return;
-    }
+    SpiceManager::FieldOfViewResult res = SpiceManager::ref().fieldOfView(
+        _projectionComponent.instrumentId()
+    );
 
     double lightTime;
     glm::dvec3 p = SpiceManager::ref().targetPosition(
         _projectionComponent.projectorId(),
         _projectionComponent.projecteeId(),
-        _mainFrame,
+        MainFrame,
         _projectionComponent.aberration(),
         time,
         lightTime
@@ -471,11 +438,11 @@ void RenderablePlanetProjection::attitudeParameters(double time) {
 
     const double distance = glm::length(p);
     const double radius = boundingSphere();
-    _projectorMatrix = _projectionComponent.computeProjectorMatrix(
+    return _projectionComponent.computeProjectorMatrix(
         p,
-        bs,
-        _up,
-        _instrumentMatrix,
+        res.boresightVector,
+        up,
+        instrumentMatrix,
         _projectionComponent.fieldOfViewY(),
         _projectionComponent.aspectRatio(),
         static_cast<float>(distance - radius),
@@ -499,29 +466,33 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&)
         _projectionComponent.generateMipMap();
     }
 
-    _camScaling = glm::vec2(1.f, 0.f); // Unit scaling
-    _up = data.camera.lookUpVectorCameraSpace();
-
+    glm::vec3 up = data.camera.lookUpVectorCameraSpace();
     if (_projectionComponent.doesPerformProjection()) {
-        int nPerformedProjections = 0;
+        int nProjections = 0;
         for (const Image& img : _imageTimes) {
-            if (nPerformedProjections >= _maxProjectionsPerFrame) {
+            if (nProjections >= _maxProjectionsPerFrame) {
                 break;
             }
-            RenderablePlanetProjection::attitudeParameters(img.timeRange.start);
-            std::shared_ptr<ghoul::opengl::Texture> t =
-                _projectionComponent.loadProjectionTexture(img.path);
-            imageProjectGPU(*t);
-            ++nPerformedProjections;
+            try {
+                glm::mat4 projectorMatrix = attitudeParameters(img.timeRange.start, up);
+                std::shared_ptr<ghoul::opengl::Texture> t =
+                    _projectionComponent.loadProjectionTexture(img.path);
+                imageProjectGPU(*t, projectorMatrix);
+                ++nProjections;
+            }
+            catch (const SpiceManager::SpiceException& e) {
+                LERRORC(e.component, e.what());
+            }
         }
-        _imageTimes.erase(
-            _imageTimes.begin(),
-            _imageTimes.begin() + nPerformedProjections
-        );
+        _imageTimes.erase(_imageTimes.begin(), _imageTimes.begin() + nProjections);
         _projectionsInBuffer = static_cast<int>(_imageTimes.size());
-
     }
-    attitudeParameters(data.time.j2000Seconds());
+    try {
+        attitudeParameters(data.time.j2000Seconds(), up);
+    }
+    catch (const SpiceManager::SpiceException& e) {
+        LERRORC(e.component, e.what());
+    }
 
     double lt;
     glm::dvec3 sunPos = SpiceManager::ref().targetPosition(
@@ -538,19 +509,16 @@ void RenderablePlanetProjection::render(const RenderData& data, RendererTasks&)
     _programObject->setUniform(_mainUniformCache.sunPos, static_cast<glm::vec3>(sunPos));
 
     // Model transform and view transform needs to be in double precision
-    glm::dmat4 modelTransform =
+    glm::dmat4 trans =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
         glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
         glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
 
-    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
+    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * trans;
 
+    _programObject->setUniform(_mainUniformCache.modelTransform, glm::mat4(trans));
     _programObject->setUniform(
-        _mainUniformCache.modelTransform,
-        glm::mat4(modelTransform)
-    );
-    _programObject->setUniform(_mainUniformCache
-        .modelViewProjectionTransform,
+        _mainUniformCache.modelViewProjectionTransform,
         data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
     );
 
@@ -625,52 +593,42 @@ void RenderablePlanetProjection::update(const UpdateData& data) {
     const double integrateFromTime = data.previousFrameTime.j2000Seconds();
 
     // Only project new images if time changed since last update.
-    if (time > integrateFromTime) {
-        if (openspace::ImageSequencer::ref().isReady()) {
-            if (_projectionComponent.doesPerformProjection()) {
-                std::vector<Image> newImageTimes;
-                openspace::ImageSequencer::ref().imagePaths(
-                    newImageTimes,
-                    _projectionComponent.projecteeId(),
-                    _projectionComponent.instrumentId(),
-                    time,
-                    integrateFromTime
-                );
+    if (time > integrateFromTime && ImageSequencer::ref().isReady() &&
+        _projectionComponent.doesPerformProjection())
+    {
+        std::vector<Image> newImageTimes= ImageSequencer::ref().imagePaths(
+            _projectionComponent.projecteeId(),
+            _projectionComponent.instrumentId(),
+            time,
+            integrateFromTime
+        );
 
-                if (!newImageTimes.empty()) {
-                    double firstNewImage = newImageTimes[0].timeRange.end;
-                    // Make sure images are always projected in the correct order
-                    // (Remove buffered images with a later timestamp)
-                    clearProjectionBufferAfterTime(firstNewImage);
-
-                    // Now, insert the new images to the buffer
-                    insertImageProjections(newImageTimes);
+        if (!newImageTimes.empty()) {
+            double firstNewImage = newImageTimes[0].timeRange.end;
+            // Make sure images are always projected in the correct order
+            // (Remove buffered images with a later timestamp)
+            const auto& it = std::find_if(
+                _imageTimes.begin(),
+                _imageTimes.end(),
+                [firstNewImage](const Image& image) {
+                    return image.timeRange.end > firstNewImage;
                 }
+            );
+            if (it != _imageTimes.end()) {
+                _imageTimes.erase(it, _imageTimes.end());
             }
+
+            // Now, insert the new images to the buffer
+            _imageTimes.insert(
+                _imageTimes.end(),
+                newImageTimes.begin(),
+                newImageTimes.end()
+            );
+            _projectionsInBuffer = static_cast<int>(_imageTimes.size());
         }
     }
 
-    _stateMatrix = data.modelTransform.rotation;
-}
-
-void RenderablePlanetProjection::clearProjectionBufferAfterTime(double time) {
-    const auto& it = std::find_if(
-        _imageTimes.begin(),
-        _imageTimes.end(),
-        [time](const Image& image) { return image.timeRange.end > time; }
-    );
-    if (it != _imageTimes.end()) {
-        _imageTimes.erase(it, _imageTimes.end());
-    }
-}
-
-void RenderablePlanetProjection::insertImageProjections(const std::vector<Image>& images)
-{
-    _imageTimes.insert(_imageTimes.end(),
-        images.begin(),
-        images.end()
-    );
-    _projectionsInBuffer = static_cast<int>(_imageTimes.size());
+    _transform = glm::mat4(data.modelTransform.rotation);
 }
 
 void RenderablePlanetProjection::loadColorTexture() {
@@ -682,13 +640,13 @@ void RenderablePlanetProjection::loadColorTexture() {
     _baseTexture = nullptr;
     if (selectedPath != NoImageText) {
         _baseTexture = ghoul::io::TextureReader::ref().loadTexture(
-            absPath(selectedPath)
+            absPath(selectedPath).string()
         );
         if (_baseTexture) {
             ghoul::opengl::convertTextureFormat(*_baseTexture, Texture::Format::RGB);
             _baseTexture->uploadTexture();
             _baseTexture->setWrapping(
-                { Texture::WrappingMode::Repeat, Texture::WrappingMode::MirroredRepeat}
+                { Texture::WrappingMode::Repeat, Texture::WrappingMode::MirroredRepeat }
             );
             _baseTexture->setFilter(Texture::FilterMode::LinearMipMap);
         }
@@ -704,7 +662,7 @@ void RenderablePlanetProjection::loadHeightTexture() {
     _heightMapTexture = nullptr;
     if (selectedPath != NoImageText) {
         _heightMapTexture = ghoul::io::TextureReader::ref().loadTexture(
-            absPath(selectedPath)
+            absPath(selectedPath).string()
         );
         if (_heightMapTexture) {
             ghoul::opengl::convertTextureFormat(*_heightMapTexture, Texture::Format::RGB);
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
index 7b36109f3a..863bb0365a 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
@@ -56,17 +56,13 @@ public:
 
     static documentation::Documentation Documentation();
 
-protected:
+private:
     void loadColorTexture();
     void loadHeightTexture();
 
-    void attitudeParameters(double time);
-
-private:
-    void imageProjectGPU(const ghoul::opengl::Texture& projectionTexture);
-
-    void clearProjectionBufferAfterTime(double time);
-    void insertImageProjections(const std::vector<Image>& images);
+    glm::mat4 attitudeParameters(double time, const glm::vec3& up);
+    void imageProjectGPU(const ghoul::opengl::Texture& projectionTexture,
+        const glm::mat4& projectorMatrix);
 
     ProjectionComponent _projectionComponent;
 
@@ -85,7 +81,7 @@ private:
         projectionFading, baseTexture, projectionTexture, heightTexture)
         _mainUniformCache;
 
-    UniformCache(projectionTexture, projectorMatrix, modelTransform, scaling, boresight,
+    UniformCache(projectionTexture, projectorMatrix, modelTransform, boresight,
         radius, segments) _fboUniformCache;
 
     std::unique_ptr<ghoul::opengl::Texture> _baseTexture;
@@ -100,13 +96,8 @@ private:
 
     std::unique_ptr<planetgeometry::PlanetGeometry> _geometry;
 
-    glm::vec2 _camScaling = glm::vec2(0.f);
-    glm::vec3 _up = glm::vec3(0.f);
     glm::mat4 _transform = glm::mat4(1.f);
     glm::mat4 _projectorMatrix = glm::mat4(1.f);
-
-    glm::dmat3 _stateMatrix = glm::dmat3(1.0);
-    glm::dmat3 _instrumentMatrix = glm::dmat3(1.0);
     glm::vec3 _boresight = glm::vec3(0.f);
 
     std::vector<Image> _imageTimes;
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index 88a3251e7d..d935219104 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -25,14 +25,13 @@
 #include <modules/spacecraftinstruments/rendering/renderableshadowcylinder.h>
 
 #include <modules/spacecraftinstruments/spacecraftinstrumentsmodule.h>
+#include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/opengl/programobject.h>
-#include <optional>
 
 namespace {
     constexpr const char* ProgramName = "ShadowCylinderProgram";
@@ -144,9 +143,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableShadowCylinder::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "newhorizons_renderable_shadowcylinder";
-    return doc;
+    return codegen::doc<Parameters>("newhorizons_renderable_shadowcylinder");
 }
 
 RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dictionary)
@@ -179,7 +176,6 @@ RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dict
     _shadowColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_shadowColor);
 
-
     _terminatorType.addOptions({
         { static_cast<int>(SpiceManager::TerminatorType::Umbral), "Umbral" },
         { static_cast<int>(SpiceManager::TerminatorType::Penumbral), "Penumbral" }
@@ -321,9 +317,7 @@ void RenderableShadowCylinder::createCylinder(double time) {
         res.terminatorPoints.begin(),
         res.terminatorPoints.end(),
         std::back_inserter(terminatorPoints),
-        [](const glm::dvec3& p) {
-            return p * 1000.0;
-        }
+        [](const glm::dvec3& p) { return p * 1000.0; }
     );
 
     double lt;
@@ -364,7 +358,7 @@ void RenderableShadowCylinder::createCylinder(double time) {
         GL_ARRAY_BUFFER,
         0,
         _vertices.size() * sizeof(CylinderVBOLayout),
-        &_vertices[0]
+        _vertices.data()
     );
 
     glEnableVertexAttribArray(0);
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
index c6caaf4f8d..8583a80e3e 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
@@ -32,7 +32,6 @@
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
-
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/uniformcache.h>
 
diff --git a/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl b/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
index 08c86633b5..110e92ab7a 100644
--- a/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
@@ -24,15 +24,14 @@
 
 #include "fragment.glsl"
 
-in vec4 vs_positionScreenSpace;
+in float vs_depth;
 in vec4 vs_color;
 
-uniform float _alpha;
-
+uniform float alpha;
 
 Fragment getFragment() {
-    Fragment frag;
-    frag.color = vec4(vs_color.rgb, vs_color.a * _alpha);
-    frag.depth = vs_positionScreenSpace.w;
-    return frag;
+  Fragment frag;
+  frag.color = vec4(vs_color.rgb, vs_color.a * alpha);
+  frag.depth = vs_depth;
+  return frag;
 }
diff --git a/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl b/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
index 551a19ee5a..96eb1f63c5 100644
--- a/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
@@ -30,15 +30,15 @@ layout(location = 0) in vec3 in_position;
 layout(location = 1) in vec4 in_color;
 
 out vec4 vs_color;
-out vec4 vs_positionScreenSpace;
+out float vs_depth;
 
 uniform mat4 modelViewProjection;
 
-
 void main() {
-    vec4 positionClipSpace = modelViewProjection * vec4(in_position, 1.0);
-    vs_positionScreenSpace = z_normalization(positionClipSpace);
-    gl_Position = vs_positionScreenSpace;
+  vec4 positionClipSpace = modelViewProjection * vec4(in_position, 1.0);
+  vec4 p = z_normalization(positionClipSpace);
+  vs_depth = p.w;
+  gl_Position = p;
 
-    vs_color = in_color;
+  vs_color = in_color;
 }
diff --git a/modules/spacecraftinstruments/shaders/dilation_fs.glsl b/modules/spacecraftinstruments/shaders/dilation_fs.glsl
index 18df1d1f08..4d07e62ef3 100644
--- a/modules/spacecraftinstruments/shaders/dilation_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/dilation_fs.glsl
@@ -30,64 +30,62 @@ out vec4 color;
 uniform sampler2D tex;
 uniform sampler2D stencil;
 
-// We conside the 8-neighborhood of a texel, so going a stepsize of '1' in both
-// directions
+// We conside the 8-neighborhood of a texel, so going a stepsize of '1' in both directions
 vec2 offsets[8] = vec2[](
-    vec2(-1.0, -1.0),
-    vec2(-1.0,  0.0),
-    vec2(-1.0,  1.0),
-    vec2(0.0,  -1.0),
-    vec2(0.0,   1.0),
-    vec2(1.0,  -1.0),
-    vec2(1.0,   0.0),
-    vec2(1.0,   1.0)
+  vec2(-1.0, -1.0),
+  vec2(-1.0,  0.0),
+  vec2(-1.0,  1.0),
+  vec2( 0.0, -1.0),
+  vec2( 0.0,  1.0),
+  vec2( 1.0, -1.0),
+  vec2( 1.0,  0.0),
+  vec2( 1.0,  1.0)
 );
 
-// Collect the contributing colors from the neighboring texels and return the
-// averaged value of all texels that passed the masking test based on 'stencil'
+// Collect the contributing colors from the neighboring texels and return the averaged
+// value of all texels that passed the masking test based on 'stencil'
 vec3 gatherNeighboringColors() {
-    vec2 texSize = textureSize(tex, 0);
+  vec2 texSize = textureSize(tex, 0);
 
-    // The total number of contributing texels
-    int nContributions = 0;
+  // The total number of contributing texels
+  int nContributions = 0;
 
-    // The summed color of all contributing texels
-    vec3 totalColor = vec3(0.0);
+  // The summed color of all contributing texels
+  vec3 totalColor = vec3(0.0);
 
-    for (int i = 0; i < 8; i++) {
-        // gl_FragCoord is in pixel coordinates; the ProjectionComponent sets
-        // the viewport such that pixels=texels, so we can use gl_FragCoord as an
-        // integer texel coordinate
-        // First offsetting them, then dividing by the texture size to get to [0,1]
-        vec2 samplePosition = (gl_FragCoord.xy + offsets[i]) / texSize;
+  for (int i = 0; i < 8; i++) {
+    // gl_FragCoord is in pixel coordinates; the ProjectionComponent sets the viewport
+    // such that pixels=texels, so we can use gl_FragCoord as an integer texel coordinate
+    // First offsetting them, then dividing by the texture size to get to [0,1]
+    vec2 samplePosition = (gl_FragCoord.xy + offsets[i]) / texSize;
 
-        // The stencelling determines the areas that we have to enlarge, such that we
-        // do not enlarge a previously enlarged area
-        if (texture(stencil, samplePosition).r != 0.0) {
-            totalColor += texture(tex, samplePosition).rgb;
-            nContributions++;
-        }
+    // The stencelling determines the areas that we have to enlarge, such that we do not
+    // enlarge a previously enlarged area
+    if (texture(stencil, samplePosition).r != 0.0) {
+      totalColor += texture(tex, samplePosition).rgb;
+      nContributions++;
     }
+  }
 
-    // GLSL normally doesn't have a problem taking vec3(0.0)/0.0 but we don't want to
-    // tempt the compiler gods
-    if (nContributions > 0) {
-        return totalColor / nContributions;
-    }
-    else {
-        return vec3(0.0);
-    }
+  // GLSL normally doesn't have a problem taking vec3(0.0)/0.0 but we don't want to tempt
+  // the compiler gods
+  if (nContributions > 0) {
+    return totalColor / nContributions;
+  }
+  else {
+    return vec3(0.0);
+  }
 }
 
 void main() {
-    if (texture(stencil, vs_uv).r == 0.0) {
-        // This means that the current fragment/texel we are looking at has not been
-        // projected on and we only want to do the dilation into these texels
-        color = vec4(gatherNeighboringColors(), 1.0);
-    }
-    else {
-        // We are in a region where an image has been projected, so we can reuse the
-        // already sampled version
-        color = texture(tex, vs_uv);
-    }
+  if (texture(stencil, vs_uv).r == 0.0) {
+    // This means that the current fragment/texel we are looking at has not been projected
+    // on and we only want to do the dilation into these texels
+    color = vec4(gatherNeighboringColors(), 1.0);
+  }
+  else {
+    // We are in a region where an image has been projected, so we can reuse the already
+    // sampled version
+    color = texture(tex, vs_uv);
+  }
 }
diff --git a/modules/spacecraftinstruments/shaders/dilation_vs.glsl b/modules/spacecraftinstruments/shaders/dilation_vs.glsl
index f0e692aab0..047e690d42 100644
--- a/modules/spacecraftinstruments/shaders/dilation_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/dilation_vs.glsl
@@ -29,6 +29,6 @@ layout(location = 0) in vec2 in_position;
 out vec2 vs_uv;
 
 void main() {
-    vs_uv  = (in_position + vec2(1.0)) / vec2(2.0);
-    gl_Position  = vec4(in_position, 0.0, 1.0);
+  vs_uv = (in_position + vec2(1.0)) / vec2(2.0);
+  gl_Position = vec4(in_position, 0.0, 1.0);
 }
diff --git a/modules/spacecraftinstruments/shaders/fov_fs.glsl b/modules/spacecraftinstruments/shaders/fov_fs.glsl
index f05491be6f..b01a1f7aaf 100644
--- a/modules/spacecraftinstruments/shaders/fov_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/fov_fs.glsl
@@ -25,11 +25,11 @@
 #include "fragment.glsl"
 
 in vec4 vs_color;
-in vec4 vs_positionScreenSpace;
+in float vs_depth;
 
 Fragment getFragment() {
-    Fragment frag;
-    frag.color = vs_color;
-    frag.depth = vs_positionScreenSpace.w;
-    return frag;
+  Fragment frag;
+  frag.color = vs_color;
+  frag.depth = vs_depth;
+  return frag;
 }
diff --git a/modules/spacecraftinstruments/shaders/fov_vs.glsl b/modules/spacecraftinstruments/shaders/fov_vs.glsl
index 8d067e7645..63053b2bf5 100644
--- a/modules/spacecraftinstruments/shaders/fov_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/fov_vs.glsl
@@ -30,12 +30,11 @@ layout(location = 0) in vec3 in_point_position;
 layout (location = 1) in int colorInformation;
 
 out vec4 vs_color;
-out vec4 vs_positionScreenSpace;
+out float vs_depth;
 
 uniform mat4 modelViewProjectionTransform;
-
-uniform vec3 defaultColorStart;
-uniform vec3 defaultColorEnd;
+uniform vec3 colorStart;
+uniform vec3 colorEnd;
 uniform vec3 activeColor;
 uniform vec3 targetInFieldOfViewColor;
 uniform vec3 intersectionStartColor;
@@ -52,39 +51,46 @@ const int VertexColorTypeIntersectionStart = 4;
 const int VertexColorTypeIntersectionEnd = 5;
 const int VertexColorTypeSquare = 6;
 
-
 void main() {
-    vec4 position = vec4(in_point_position, 1);
-    vec4 positionClipSpace = modelViewProjectionTransform * position;
+  vec4 positionClipSpace = modelViewProjectionTransform * vec4(in_point_position, 1.0);
 
-    vs_positionScreenSpace = z_normalization(positionClipSpace);
-    gl_Position = vs_positionScreenSpace;
+  vec4 pos = z_normalization(positionClipSpace);
+  vs_depth = pos.w;
+  gl_Position = pos;
 
-    vec3 color;
-    switch (colorInformation) { 
-        case VertexColorTypeDefaultStart:
-            color = defaultColorStart;
-            break;
-        case VertexColorTypeDefaultEnd:
-            color = defaultColorEnd;
-            break;
-        case VertexColorTypeInFieldOfView:
-            color = activeColor * interpolation + targetInFieldOfViewColor * (1 - interpolation);
-            break;
-        case VertexColorTypeActive:
-            color = activeColor;
-            break;
-        case VertexColorTypeIntersectionStart:
-            color = intersectionStartColor;
-            break;
-        case VertexColorTypeIntersectionEnd:
-            color = activeColor * interpolation + intersectionEndColor * (1 - interpolation);
-            break;
-        case VertexColorTypeSquare:
-            color = activeColor * interpolation + squareColor * (1 - interpolation);
-            break;
-        default:
-            color = vec3(1.0, 0.0, 1.0);
-    }
-    vs_color = vec4(color, 1.0);
+  vec3 color;
+  switch (colorInformation) { 
+    case VertexColorTypeDefaultStart:
+      vs_color = vec4(colorStart, 1.0);
+      break;
+    case VertexColorTypeDefaultEnd:
+      vs_color = vec4(colorEnd, 1.0);
+      break;
+    case VertexColorTypeInFieldOfView:
+      vs_color = vec4(
+        activeColor * interpolation + targetInFieldOfViewColor * (1.0 - interpolation),
+        1.0
+      );
+      break;
+    case VertexColorTypeActive:
+      vs_color = vec4(activeColor, 1.0);
+      break;
+    case VertexColorTypeIntersectionStart:
+      vs_color = vec4(intersectionStartColor, 1.0);
+      break;
+    case VertexColorTypeIntersectionEnd:
+      vs_color = vec4(
+        activeColor * interpolation + intersectionEndColor * (1.0 - interpolation),
+        1.0
+      );
+      break;
+    case VertexColorTypeSquare:
+      vs_color = vec4(
+        activeColor * interpolation + squareColor * (1.0 - interpolation),
+        1.0
+      );
+      break;
+    default:
+      vs_color = vec4(1.0, 0.0, 1.0, 1.0);
+  }
 }
diff --git a/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
index 9d01c9a7c3..7aa6626a90 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
@@ -27,6 +27,5 @@
 out vec4 fragColor;
 
 void main() {
-    fragColor = vec4(1.0);
-    //gl_FragDepth = gl_FragCoord.z;
+  fragColor = vec4(1.0);
 }
diff --git a/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
index 731c82ef9a..1c332f1a46 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
@@ -31,8 +31,6 @@ layout(location = 0) in vec4 in_position;
 uniform mat4 ProjectorMatrix;
 uniform mat4 ModelTransform;
 
-
 void main() {
-    gl_Position = ProjectorMatrix * ModelTransform *
-        psc_to_meter(in_position, vec2(1.0, 0.0));
+  gl_Position = ProjectorMatrix * ModelTransform * psc_to_meter(in_position, vec2(1.0, 0.0));
 }
diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
index 4d8563d5a2..e1c7c4e283 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
@@ -24,7 +24,6 @@
 
 #version __CONTEXT__
 
-in vec4 vs_position;
 in vec4 vs_ndc;
 in vec4 vs_normal;
 
@@ -35,54 +34,41 @@ layout (location = 1) out vec4 stencil;
 
 uniform sampler2D projectionTexture;
 uniform sampler2D depthTexture;
-
 uniform bool needShadowMap;
-
-uniform mat4 ModelTransform;
 uniform vec3 boresight;
-uniform vec4 debugColor;
 
 bool inRange(float x, float a, float b) {
-    return (x >= a && x <= b);
+  return (x >= a && x <= b);
 } 
 
 void main() {
-    vec3 n = normalize(vs_normal.xyz);
-    vec4 projected = vs_ndc;
-    vec2 uv = vec2(0.5) * projected.xy + vec2(0.5);
+  vec3 n = normalize(vs_normal.xyz);
+  vec2 uv = vec2(0.5) * vs_ndc.xy + vec2(0.5);
 
-    if (needShadowMap) {
-        float thisDepth = projected.z * 0.5 + 0.5;
-        float closestDepth = texture(depthTexture, uv).r;
-        const float epsilon = 0.001;
+  if (needShadowMap) {
+    float thisDepth = vs_ndc.z * 0.5 + 0.5;
+    float closestDepth = texture(depthTexture, uv).r;
+    const float epsilon = 0.001;
 
-        if (inRange(uv.x, 0.0, 1.0) && inRange(uv.y, 0.0, 1.0) &&
-            dot(n, boresight) < 0 && thisDepth <= closestDepth + epsilon)
-        {
-            // color = texture(projectionTexture, projected.xy);
-            color = texture(projectionTexture, vec2(1.0) - uv);
-            color.a = 1.0;
-            stencil = vec4(1.0);
-        }
-        else {
-            discard;
-            // color = vec4(vec3(0.0), 0.0);
-            // stencil = vec4(0.0);
-        }
+    if (inRange(uv.x, 0.0, 1.0) && inRange(uv.y, 0.0, 1.0) &&
+        dot(n, boresight) < 0 && thisDepth <= closestDepth + epsilon)
+    {
+      color = texture(projectionTexture, vec2(1.0) - uv);
+      color.a = 1.0;
+      stencil = vec4(1.0);
     }
     else {
-        if (inRange(uv.x, 0.0, 1.0) && inRange(uv.y, 0.0, 1.0) &&
-            dot(n, boresight) < 0)
-        {
-            // color = texture(projectionTexture, projected.xy);
-            color = texture(projectionTexture, vec2(1.0) - uv);
-            color.a = 1.0;
-            stencil = vec4(1.0);
-        }
-        else {
-            discard;
-            // color = vec4(0.0);
-            // stencil = vec4(0.0);
-        }
+      discard;
     }
+  }
+  else {
+    if (inRange(uv.x, 0.0, 1.0) && inRange(uv.y, 0.0, 1.0) && dot(n, boresight) < 0) {
+      color = texture(projectionTexture, vec2(1.0) - uv);
+      color.a = 1.0;
+      stencil = vec4(1.0);
+    }
+    else {
+      discard;
+    }
+  }
 }
diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
index 5d9ed84f35..be246fa5b0 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
@@ -30,26 +30,20 @@ layout(location = 0) in vec4 in_position;
 layout(location = 1) in vec2 in_st;
 layout(location = 2) in vec3 in_normal;
 
-out vec4 vs_position;
-out vec4 vs_normal;
-out vec2 vs_uv;
 out vec4 vs_ndc;
+out vec4 vs_normal;
 
 uniform mat4 ProjectorMatrix;
 uniform mat4 ModelTransform;
 uniform mat4 meshTransform;
 uniform mat4 meshNormalTransform;
 
-uniform vec3 boresight;
-
 void main() {
-    vec4 raw_pos = psc_to_meter((meshTransform * in_position), vec2(1.0, 0.0));
-    vs_position = ProjectorMatrix * ModelTransform * raw_pos;
-    vs_normal = normalize(ModelTransform * meshNormalTransform * vec4(in_normal,0));
-    vs_ndc = vs_position / vs_position.w;
+  vec4 raw_pos = psc_to_meter(meshTransform * in_position, vec2(1.0, 0.0));
+  vec4 position = ProjectorMatrix * ModelTransform * raw_pos;
+  vs_normal = normalize(ModelTransform * meshNormalTransform * vec4(in_normal, 0.0));
+  vs_ndc = position / position.w;
 
-    //match clipping plane
-    vec2 texco = (in_st * 2) - 1; 
-    vs_uv = texco;
-    gl_Position = vec4(texco, 0.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 23b3035869..7e8b2e1f55 100644
--- a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
@@ -27,64 +27,63 @@
 
 in vec2 vs_st;
 in vec3 vs_normalViewSpace;
-in vec4 vs_positionScreenSpace;
+in float vs_depth;
 in vec4 vs_positionCameraSpace;
 
 uniform sampler2D baseTexture;
 uniform sampler2D projectionTexture;
-
-uniform bool _performShading;
-uniform float _projectionFading;
+uniform bool performShading;
+uniform float projectionFading;
 uniform vec3 directionToSunViewSpace;
 
+const vec3 specularAlbedo = vec3(1.0);
+
+const float ambientIntensity = 0.15;
+const float diffuseIntensity = 1.0;
+const float specularIntensity = 0.0;
+const float specularPower = 100.0;
 
 Fragment getFragment() {
-    vec4 textureColor = texture(baseTexture, vs_st);
-    vec4 projectionColor = texture(projectionTexture, vs_st);
-    if (projectionColor.a > 0.0) {
-        textureColor.rgb = mix(
-            textureColor.rgb,
-            projectionColor.rgb,
-            _projectionFading * projectionColor.a
-        );
-    }
+  vec4 textureColor = texture(baseTexture, vs_st);
+  vec4 projectionColor = texture(projectionTexture, vs_st);
+  if (projectionColor.a > 0.0) {
+    textureColor.rgb = mix(
+      textureColor.rgb,
+      projectionColor.rgb,
+      projectionFading * projectionColor.a
+    );
+  }
+  
+  vec3 diffuseAlbedo = textureColor.rgb;
+
+  Fragment frag;
+  if (performShading) {
+    // Some of these values could be passed in as uniforms
+    const vec3 lightColorAmbient = vec3(1.0);
+    const vec3 lightColor = vec3(1.0);
     
-    vec3 diffuseAlbedo = textureColor.rgb;
-    vec3 specularAlbedo = vec3(1.0);
+    vec3 n = normalize(vs_normalViewSpace);
+    vec3 l = directionToSunViewSpace;
+    vec3 c = normalize(vs_positionCameraSpace.xyz);
+    vec3 r = reflect(l, n);
 
-    Fragment frag;
-    if (_performShading) {
-        // 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);
-        vec3 r = reflect(l, n);
+    float diffuseCosineFactor = dot(n,l);
+    float specularCosineFactor = dot(c,r);
 
-        const float ambientIntensity = 0.15;
-        const float diffuseIntensity = 1.0;
-        const float specularIntensity = 0.0;
+    vec3 ambientColor = ambientIntensity * lightColorAmbient * diffuseAlbedo;
+    vec3 diffuseColor = 
+        diffuseIntensity * lightColor * diffuseAlbedo * max(diffuseCosineFactor, 0.0);
+    vec3 specularColor = specularIntensity * lightColor * specularAlbedo *
+        pow(max(specularCosineFactor, 0.0), specularPower);
 
-        float diffuseCosineFactor = dot(n,l);
-        float specularCosineFactor = dot(c,r);
-        const float specularPower = 100.0;
+    frag.color.rgb = ambientColor + diffuseColor + specularColor;
+  }
+  else {
+    frag.color.rgb = diffuseAlbedo;
+  }
 
-        vec3 ambientColor = ambientIntensity * lightColorAmbient * diffuseAlbedo;
-        vec3 diffuseColor = 
-            diffuseIntensity * lightColor * diffuseAlbedo * max(diffuseCosineFactor, 0.0);
-        vec3 specularColor = specularIntensity * lightColor * specularAlbedo *
-            pow(max(specularCosineFactor, 0.0), specularPower);
-
-        frag.color.rgb = ambientColor + diffuseColor + specularColor;
-    }
-    else {
-        frag.color.rgb = diffuseAlbedo;
-    }
-
-    frag.color.a = 1.0;
-    frag.depth = vs_positionScreenSpace.w;
-    // frag.depth = 0.0;
-    return frag;
+  frag.color.a = 1.0;
+  frag.depth = vs_depth;
+  // frag.depth = 0.0;
+  return frag;
 }
diff --git a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
index 388b589732..7f6244f3b7 100644
--- a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
@@ -32,27 +32,25 @@ layout(location = 2) in vec3 in_normal;
 
 out vec2 vs_st;
 out vec3 vs_normalViewSpace;
-out vec4 vs_positionScreenSpace;
+out float vs_depth;
 out vec4 vs_positionCameraSpace;
 
 uniform mat4 modelViewTransform;
 uniform mat4 projectionTransform;
 uniform vec3 cameraDirectionWorldSpace;
-uniform float _magnification;
 uniform mat4 meshTransform;
 uniform mat4 meshNormalTransform;
 
-
 void main() {
-    vec4 position = meshTransform * in_position; // Position already in homogenous coordinates
-    position.xyz *= pow(10, _magnification);
-    vs_positionCameraSpace = modelViewTransform * position;
-    vec4 positionClipSpace = projectionTransform * vs_positionCameraSpace;
+  vec4 position = meshTransform * in_position;
+  vs_positionCameraSpace = modelViewTransform * position;
+  vec4 positionClipSpace = projectionTransform * vs_positionCameraSpace;
 
-    vs_st = in_st;
-    vs_positionScreenSpace = z_normalization(positionClipSpace);
-    gl_Position = vs_positionScreenSpace;
-    
-    // The normal transform should be the transposed inverse of the model transform?
-    vs_normalViewSpace = normalize(mat3(modelViewTransform) * (mat3(meshNormalTransform) * in_normal));
+  vs_st = in_st;
+  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 dcba10ec68..083ad3bccf 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
@@ -32,61 +32,57 @@ layout (location = 0) out vec4 color;
 layout (location = 1) out vec4 stencil;
 
 uniform sampler2D projectionTexture;
-
 uniform mat4 ProjectorMatrix;
 uniform mat4 ModelTransform;
-
-uniform vec2 _scaling;
-uniform vec3 _radius;
-uniform int _segments;
-
+uniform vec3 radius;
+uniform int segments;
 uniform vec3 boresight;
 
-#define M_PI 3.14159265358979323846
+const float M_PI = 3.14159265358979323846;
 
 vec4 uvToModel(vec2 uv, vec3 radius, float segments) {
-    float fj = uv.x * segments;
-    float fi = (1.0 - uv.y) * segments;
+  float fj = uv.x * segments;
+  float fi = (1.0 - uv.y) * segments;
 
-    float theta = fi * float(M_PI) / segments;  // 0 -> PI
-    float phi   = fj * float(M_PI) * 2.0f / segments;
+  float theta = fi * M_PI / segments;  // 0 -> PI
+  float phi   = fj * M_PI * 2.0 / segments;
 
-    float x = radius[0] * sin(theta) * cos(phi);
-    float y = radius[1] * sin(theta) * sin(phi);
-    float z = radius[2] * cos(theta);
-    
-    return vec4(x, y, z, 0.0);
+  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);
+bool inRange(float x, float a, float b) {
+  return (x >= a && x <= b);
 } 
 
 void main() {
-    vec2 uv = (vs_position + vec2(1.0)) / vec2(2.0);
+  vec2 uv = (vs_position + vec2(1.0)) / vec2(2.0);
 
-    vec4 vertex = uvToModel(uv, _radius, _segments);
+  vec4 vertex = uvToModel(uv, radius, segments);
 
-    vec4 raw_pos   = psc_to_meter(vertex, _scaling);
-    vec4 projected = ProjectorMatrix * ModelTransform * raw_pos;
+  vec4 raw_pos = psc_to_meter(vertex, vec2(1.0, 0.0));
+  vec4 projected = ProjectorMatrix * ModelTransform * raw_pos;
 
-    projected.x /= projected.w;
-    projected.y /= projected.w;
+  projected.x /= projected.w;
+  projected.y /= projected.w;
 
-    projected = projected * 0.5 + vec4(0.5);
+  projected = projected * 0.5 + vec4(0.5);
 
-    vec3 normal = normalize((ModelTransform * vec4(vertex.xyz, 0.0)).xyz);
+  vec3 normal = normalize((ModelTransform * vec4(vertex.xyz, 0.0)).xyz);
 
-    vec3 v_b = normalize(boresight);
+  vec3 v_b = normalize(boresight);
 
-    if ((inRange(projected.x, 0.0, 1.0) && inRange(projected.y, 0.0, 1.0)) &&
-        dot(v_b, normal) < 0.0)
-    {
-        color = texture(projectionTexture, vec2(projected.x, projected.y));
-        stencil = vec4(1.0); 
-    }
-    else {
-        color = vec4(0.0);
-        stencil = vec4(0.0);
-    }
+  if ((inRange(projected.x, 0.0, 1.0) && inRange(projected.y, 0.0, 1.0)) &&
+      dot(v_b, normal) < 0.0)
+  {
+    color = texture(projectionTexture, vec2(projected.x, projected.y));
+    stencil = vec4(1.0); 
+  }
+  else {
+    color = vec4(0.0);
+    stencil = vec4(0.0);
+  }
 }
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
index 7d138ee0ed..e64cd57333 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
@@ -29,6 +29,6 @@ layout(location = 0) in vec2 in_position;
 out vec2 vs_position;
 
 void main() {
-    vs_position  = in_position;
-    gl_Position  = vec4(in_position, 0.0, 1.0);
+  vs_position = in_position;
+  gl_Position = vec4(in_position, 0.0, 1.0);
 }
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
index 6b65b27563..1613a67c52 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
@@ -25,53 +25,45 @@
 #include "PowerScaling/powerScaling_fs.hglsl"
 #include "fragment.glsl"
 
-in vec4 vs_positionScreenSpace;
-in vec4 vs_normal;
+in vec3 vs_normal;
 in vec2 vs_st;
+in float vs_depth;
 
 uniform sampler2D baseTexture;
 uniform sampler2D projectionTexture;
-uniform bool _meridianShift;
-uniform float _ambientBrightness;
-
-uniform float _projectionFading;
-
-uniform bool _hasBaseMap;
-
+uniform bool meridianShift;
+uniform float ambientBrightness;
+uniform float projectionFading;
+uniform bool hasBaseMap;
 uniform vec4 objpos;
 uniform vec3 sun_pos;
 
-
 Fragment getFragment() {
-    vec2 st = vs_st;
-    if (_meridianShift) {
-        st.s += 0.5;
-    }
+  vec2 st = vs_st;
+  if (meridianShift) {
+    st.s += 0.5;
+  }
 
-    vec3 n = normalize(vs_normal.xyz);
+  vec3 n = normalize(vs_normal);
+  vec3 l_dir = normalize(sun_pos - objpos.xyz);
+  float intensity = min(max(5.0 * dot(n, l_dir), ambientBrightness), 1.0);
 
-    vec3 l_pos = sun_pos; // sun
-    vec3 l_dir = normalize(l_pos - objpos.xyz);
-    float intensity = min(max(5 * dot(n,l_dir), _ambientBrightness), 1);
+  vec4 textureColor = vec4(0.2, 0.2, 0.2, 1.0);
+  if (hasBaseMap) {
+    textureColor = texture(baseTexture, st);
+  }
+  vec4 projectionColor = texture(projectionTexture, vs_st);
+  if (projectionColor.a != 0.0) {
+    textureColor.rgb = mix(
+      textureColor.rgb,
+      projectionColor.rgb,
+      min(projectionFading, projectionColor.a)
+    );
+  }
 
-    vec4 ambient = vec4(0.0, 0.0, 0.0, 1.0);
+  Fragment frag;
+  frag.color = max(intensity * textureColor, vec4(0.0, 0.0, 0.0, 1.0));
+  frag.depth = vs_depth;
 
-    vec4 textureColor = vec4(0.2, 0.2, 0.2, 1.0);
-    if (_hasBaseMap) {
-        textureColor = texture(baseTexture, st);
-    }
-    vec4 projectionColor = texture(projectionTexture, vs_st);
-    if (projectionColor.a != 0.0) {
-        textureColor.rgb = mix(
-            textureColor.rgb,
-            projectionColor.rgb,
-            min(_projectionFading, projectionColor.a)
-        );
-    }
-
-    Fragment frag;
-    frag.color = max(intensity * textureColor, ambient);
-    frag.depth = vs_positionScreenSpace.w;
-
-    return frag;
+  return frag;
 }
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
index 123d70eb92..d6fc01ccbc 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
@@ -30,43 +30,42 @@ layout(location = 0) in vec4 in_position;
 layout(location = 1) in vec2 in_st;
 layout(location = 2) in vec3 in_normal;
 
-out vec4 vs_normal;
+out vec3 vs_normal;
 out vec2 vs_st;
-out vec4 vs_positionScreenSpace;
+out float vs_depth;
 
 uniform mat4 modelTransform;
 uniform mat4 modelViewProjectionTransform;
-
-uniform bool _hasHeightMap;
-uniform float _heightExaggeration;
+uniform bool hasHeightMap;
+uniform float heightExaggeration;
 uniform sampler2D heightTexture;
-
-uniform bool _meridianShift;
+uniform bool meridianShift;
 
 void main() {
-    vs_st = in_st;
+  vs_st = in_st;
 
-    vec4 tmp = in_position;
-    
-    // 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));
-    
-    if (_hasHeightMap) {
-        vec2 st = vs_st;
-        if (_meridianShift) {
-            st += vec2(0.5, 0.0);
-        }
-        float height = texture(heightTexture, st).s;
-        vec3 displacementDirection = (normalize(tmp.xyz));
-        float displacementFactor = height * _heightExaggeration;
-        tmp.xyz += displacementDirection * displacementFactor;
+  vec3 tmp = in_position.xyz;
+  
+  // 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) {
+      st += vec2(0.5, 0.0);
     }
+    float height = texture(heightTexture, st).s;
+    vec3 displacementDirection = normalize(tmp);
+    float displacementFactor = height * heightExaggeration;
+    tmp += displacementDirection * displacementFactor;
+  }
 
-    // convert from psc to homogeneous coordinates
-    vec4 position = vec4(tmp.xyz, 1);
-    vec4 positionClipSpace = modelViewProjectionTransform * position;
-    vs_positionScreenSpace = z_normalization(positionClipSpace);
+  // convert from psc to homogeneous coordinates
+  vec4 position = vec4(tmp, 1.0);
+  vec4 positionClipSpace = modelViewProjectionTransform * position;
+  vec4 p = z_normalization(positionClipSpace);
 
-    gl_Position = vs_positionScreenSpace;
+  vs_depth = p.w;
+  gl_Position = p;
 }
diff --git a/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl b/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
index eaef27c5c9..dd3d748a97 100644
--- a/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
@@ -22,18 +22,16 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include "PowerScaling/powerScaling_fs.hglsl"
 #include "fragment.glsl"
 
-in vec4 vs_positionScreenSpace;
 in vec3 vs_color;
+in float vs_depth;
 
 uniform float opacity;
 
 Fragment getFragment() {
-    Fragment frag;
-    frag.color = vec4(vs_color, opacity);
-    frag.depth = vs_positionScreenSpace.w;
-
-    return frag;
+  Fragment frag;
+  frag.color = vec4(vs_color, opacity);
+  frag.depth = vs_depth;
+  return frag;
 }
diff --git a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
index ac79d14c86..cf50d23cfb 100644
--- a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
@@ -29,23 +29,23 @@
 layout(location = 0) in vec4 in_point_position;
 
 out vec3 vs_color;
-out vec4 vs_positionScreenSpace;
+out float vs_depth;
 
 uniform mat4 modelViewProjectionTransform;
-
 uniform vec3 shadowColor;
 
 void main() {
-    if (mod(gl_VertexID, 2) == 0.0) {
-        vs_color = shadowColor;
-    }
-    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;
-    vs_positionScreenSpace = z_normalization(positionClipSpace);
-    gl_Position = vs_positionScreenSpace;
+  if (mod(gl_VertexID, 2) == 0.0) {
+    vs_color = shadowColor;
+  }
+  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;
+  vec4 p = z_normalization(positionClipSpace);
+  vs_depth = p.w;
+  gl_Position = p;
 }
diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
index c0bfebbfa1..3781b8595d 100644
--- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
+++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
@@ -31,16 +31,11 @@
 #include <modules/spacecraftinstruments/rendering/renderableplaneprojection.h>
 #include <modules/spacecraftinstruments/rendering/renderableplanetprojection.h>
 #include <modules/spacecraftinstruments/rendering/renderableshadowcylinder.h>
-#include <modules/spacecraftinstruments/util/decoder.h>
 #include <modules/spacecraftinstruments/util/imagesequencer.h>
 #include <modules/spacecraftinstruments/util/instrumentdecoder.h>
 #include <modules/spacecraftinstruments/util/targetdecoder.h>
 #include <openspace/documentation/documentation.h>
-#include <openspace/rendering/renderable.h>
 #include <openspace/util/factorymanager.h>
-#include <ghoul/misc/assert.h>
-#include <ghoul/misc/profiling.h>
-#include <ghoul/misc/templatefactory.h>
 
 namespace openspace {
 
@@ -102,7 +97,7 @@ bool SpacecraftInstrumentsModule::addFrame(std::string body, std::string frame)
         return false;
     }
     else {
-        _frameByBody.emplace_back(body, frame);
+        _frameByBody.emplace_back(std::move(body), std::move(frame));
         return true;
     }
 }
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index 4c413a72df..c0063b3af8 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -34,6 +34,7 @@
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/fmt.h>
+#include <filesystem>
 #include <fstream>
 
 namespace {
@@ -52,11 +53,8 @@ namespace {
         return 0.0;
     }
 
-    double ephemerisTimeFromMissionElapsedTime(const std::string& line,
-                                               double metReference)
-    {
-        std::string::size_type sz;
-        return ephemerisTimeFromMissionElapsedTime(std::stod(line, &sz), metReference);
+    double ephemerisTimeFromMissionElapsedTime(const std::string& line, double met) {
+        return ephemerisTimeFromMissionElapsedTime(std::stod(line), met);
     }
 } // namespace
 
@@ -72,10 +70,10 @@ HongKangParser::HongKangParser(std::string name, std::string fileName,
     , _spacecraft(std::move(spacecraft))
     , _potentialTargets(std::move(potentialTargets))
 {
-    //get the different instrument types
-    //for each decoder (assuming might have more if hong makes changes)
+    // get the different instrument types
+    // for each decoder (assuming might have more if hong makes changes)
     for (std::string_view decoderType : translationDictionary.keys()) {
-        //create dictionary containing all {playbookKeys , spice IDs}
+        // create dictionary containing all {playbookKeys , spice IDs}
         if (decoderType == "Instrument") {
             if (!translationDictionary.hasKey(decoderType) ||
                 !translationDictionary.hasValue<ghoul::Dictionary>(decoderType))
@@ -100,8 +98,8 @@ HongKangParser::HongKangParser(std::string name, std::string fileName,
                     decoderDictionary,
                     std::string(decoderType)
                 );
-                //insert decoder to map - this will be used in the parser to determine
-                //behavioral characteristics of each instrument
+                // insert decoder to map - this will be used in the parser to determine
+                // behavioral characteristics of each instrument
                 _fileTranslation[std::string(key)] = std::move(decoder);
             }
         }
@@ -134,7 +132,7 @@ std::string HongKangParser::findPlaybookSpecifiedTarget(std::string line) {
 }
 
 bool HongKangParser::create() {
-    //check input for errors.
+    // check input for errors.
     const bool hasObserver = SpiceManager::ref().hasNaifId(_spacecraft);
     if (!hasObserver) {
         throw ghoul::RuntimeError(
@@ -153,8 +151,7 @@ bool HongKangParser::create() {
         return true;
     }
 
-    const std::string& extension = ghoul::filesystem::File(_fileName).fileExtension();
-    if (extension != "txt") {
+    if (std::filesystem::path(_fileName).extension() != ".txt") {
         return true;
     }
 
@@ -164,13 +161,12 @@ bool HongKangParser::create() {
 
     constexpr const double Exposure = 0.01;
 
-
     std::string previousTarget;
     std::string previousCamera;
 
     double captureStart = -1.0;
 
-    std::string cameraTarget  = "VOID";
+    std::string cameraTarget = "VOID";
 
     std::string line;
     while (!file.eof()) {
@@ -185,40 +181,38 @@ bool HongKangParser::create() {
         const double time = ephemerisTimeFromMissionElapsedTime(met, _metRef);
 
         if (foundEvent) {
-            //store the time, this is used for nextCaptureTime()
+            // store the time, this is used for nextCaptureTime()
             _captureProgression.push_back(time);
 
             if (it->second->decoderType() == "CAMERA") {
-                if (captureStart == -1) {
+                if (captureStart == -1.0) {
                     //encountered new camera sequence- store start time
                     captureStart = time;
                     previousCamera = it->first;
                 }
-                //always store individual image for camera
+                // always store individual image for camera
                 std::vector<std::string> cameraSpiceID = it->second->translations();
-                //rely on playboook mdl column to determine target
+                // rely on playboook mdl column to determine target
                 cameraTarget = findPlaybookSpecifiedTarget(line);
 
-                //fill image
-
+                // fill image
                 Image image = {
                     TimeRange(time, time + Exposure),
-                    _defaultCaptureImage,
+                    _defaultCaptureImage.string(),
                     std::move(cameraSpiceID),
                     cameraTarget,
                     true,
                     false
                 };
 
-                // IFF spaccraft has decided to switch target, store in target
+                // IFF spacecraft has decided to switch target, store in target
                 // map (used for: 'next observation focus')
                 if (previousTarget != image.target) {
                     previousTarget = image.target;
                     _targetTimes.emplace_back(time, image.target);
                 }
 
-                // store actual image in map. All targets get _only_ their
-                // corresp. subset.
+                // store actual image in map. All targets get _only_ their corresp. subset
                 _subsetMap[image.target]._subset.push_back(image);
                 // compute and store the range for each subset
                 _subsetMap[image.target]._range.include(time);
@@ -235,7 +229,7 @@ bool HongKangParser::create() {
                 std::streampos len = file.tellg();
                 std::string linePeek;
                 while (!file.eof()) {
-                    //continue grabbing next line until we find what we need
+                    // continue grabbing next line until we find what we need
                     getline(file, linePeek);
                     if (linePeek.find(endNominal) != std::string::npos) {
                         met = linePeek.substr(25, 9);
@@ -246,13 +240,13 @@ bool HongKangParser::create() {
                         std::string scannerTarget = findPlaybookSpecifiedTarget(line);
 
                         TimeRange scanRange = { scanStart, scanStop };
-                        ghoul_assert(scanRange.isDefined(), "Invalid time range!");
+                        ghoul_assert(scanRange.isDefined(), "Invalid time range");
                         _instrumentTimes.emplace_back(it->first, scanRange);
 
                         // store individual image
                         Image image = {
                             scanRange,
-                            _defaultCaptureImage,
+                            _defaultCaptureImage.string(),
                             it->second->translations(),
                             cameraTarget,
                             true,
@@ -263,13 +257,12 @@ bool HongKangParser::create() {
                         break;
                     }
                 }
-                //go back to stored position in file
+                // go back to stored position in file
                 file.seekg(len, std::ios_base::beg);
             }
         }
         else {
-            // we have reached the end of a scan or consecutive capture
-            // sequence!
+            // we have reached the end of a scan or consecutive capture sequence
             if (captureStart != -1) {
                 // end of capture sequence for camera, store end time of this sequence
                 TimeRange cameraRange = { captureStart, time };
diff --git a/modules/spacecraftinstruments/util/hongkangparser.h b/modules/spacecraftinstruments/util/hongkangparser.h
index afee6984ef..4a1f03c42e 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.h
+++ b/modules/spacecraftinstruments/util/hongkangparser.h
@@ -27,11 +27,12 @@
 
 #include <modules/spacecraftinstruments/util/sequenceparser.h>
 
+#include <filesystem>
+
 namespace openspace {
 
 class HongKangParser : public SequenceParser {
 public:
-    HongKangParser();
     HongKangParser(std::string name, std::string fileName, std::string spacecraft,
         const ghoul::Dictionary& translationDictionary,
         std::vector<std::string> potentialTargets);
@@ -40,7 +41,7 @@ public:
     std::string findPlaybookSpecifiedTarget(std::string line);
 
 private:
-    std::string _defaultCaptureImage;
+    std::filesystem::path _defaultCaptureImage;
     double _metRef = 299180517;
 
     std::string _name;
diff --git a/modules/spacecraftinstruments/util/imagesequencer.cpp b/modules/spacecraftinstruments/util/imagesequencer.cpp
index af4ffd77d3..c994c78868 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.cpp
+++ b/modules/spacecraftinstruments/util/imagesequencer.cpp
@@ -41,10 +41,11 @@ ImageSequencer& ImageSequencer::ref() {
     ghoul_assert(_instance != nullptr, "Instance has not been initialized");
     return *_instance;
 }
+
 void ImageSequencer::initialize() {
     ghoul_assert(_instance == nullptr, "Instance already has been initialized");
     _instance = new ImageSequencer;
-    _instance->_defaultCaptureImage = absPath("${DATA}/placeholder.png");
+    _instance->_defaultCaptureImage = absPath("${DATA}/placeholder.png").string();
 }
 
 void ImageSequencer::deinitialize() {
@@ -52,11 +53,11 @@ void ImageSequencer::deinitialize() {
     _instance = nullptr;
 }
 
-bool ImageSequencer::isReady() {
+bool ImageSequencer::isReady() const {
     return _hasData;
 }
 
-std::pair<double, std::string> ImageSequencer::nextTarget(double time) {
+std::pair<double, std::string> ImageSequencer::nextTarget(double time) const {
     const auto it = std::lower_bound(
         _targetTimes.begin(),
         _targetTimes.end(),
@@ -72,7 +73,7 @@ std::pair<double, std::string> ImageSequencer::nextTarget(double time) {
     }
 }
 
-std::pair<double, std::string> ImageSequencer::currentTarget(double time) {
+std::pair<double, std::string> ImageSequencer::currentTarget(double time) const {
     const auto it = std::lower_bound(
         _targetTimes.begin(),
         _targetTimes.end(),
@@ -80,7 +81,7 @@ std::pair<double, std::string> ImageSequencer::currentTarget(double time) {
         [](const std::pair<double, std::string>& a, double b) { return a.first < b; }
     );
 
-    if (it != _targetTimes.end() && it != _targetTimes.begin()){
+    if (it != _targetTimes.end() && it != _targetTimes.begin()) {
         return *std::prev(it);
     }
     else {
@@ -88,51 +89,25 @@ std::pair<double, std::string> ImageSequencer::currentTarget(double time) {
     }
 }
 
-std::pair<double, std::vector<std::string>> ImageSequencer::incidentTargetList(
-                                                                              double time,
-                                                                              int range)
-{
-    std::pair<double, std::vector<std::string>> incidentTargets;
-
-    auto it = std::lower_bound(
-        _targetTimes.begin(),
-        _targetTimes.end(),
-        time,
-        [](const std::pair<double, std::string>& a, double b) { return a.first < b; }
-    );
-
-    if (it != _targetTimes.end() && it != _targetTimes.begin()){
-        // move the iterator to the first element of the range
-        std::advance(it, -(range + 1));
-
-        // now extract incident range
-        for (int i = 0; i < 2 * range + 1; i++){
-            incidentTargets.first = it->first;
-            incidentTargets.second.push_back(it->second);
-            it++;
-            if (it == _targetTimes.end()) {
-                break;
-            }
-        }
-    }
-
-    return incidentTargets;
-}
-
-double ImageSequencer::intervalLength(double time) {
-    const double upcoming = nextCaptureTime(time);
-    if (_nextCapture != upcoming) {
-        _nextCapture = upcoming;
-        _intervalLength = upcoming - time;
-    }
-    return _intervalLength;
-}
-
-double ImageSequencer::nextCaptureTime(double currentTime) {
+double ImageSequencer::prevCaptureTime(double time) const {
     const auto it = std::lower_bound(
         _captureProgression.begin(),
         _captureProgression.end(),
-        currentTime
+        time
+    );
+    if (it != _captureProgression.end() && it != _captureProgression.begin()) {
+        return *std::prev(it);
+    }
+    else {
+        return 0.0;
+    }
+}
+
+double ImageSequencer::nextCaptureTime(double time) const {
+    const auto it = std::lower_bound(
+        _captureProgression.begin(),
+        _captureProgression.end(),
+        time
     );
     if (it != _captureProgression.end()) {
         return *it;
@@ -142,10 +117,10 @@ double ImageSequencer::nextCaptureTime(double currentTime) {
     }
 }
 
-Image ImageSequencer::latestImageForInstrument(const std::string& instrumentID) {
+Image ImageSequencer::latestImageForInstrument(const std::string& instrumentID) const {
     const auto it = _latestImages.find(instrumentID);
     if (it != _latestImages.end()) {
-        return _latestImages[instrumentID];
+        return _latestImages.at(instrumentID);
     }
     else {
         return Image();
@@ -177,23 +152,24 @@ std::vector<std::pair<std::string, bool>> ImageSequencer::activeInstruments(doub
             }
         }
     }
-    // return entire map, seen in GUI.
+    // return entire map, seen in GUI
     return _switchingMap;
 }
 
-bool ImageSequencer::isInstrumentActive(double time, const std::string& instrumentID) {
+bool ImageSequencer::isInstrumentActive(double time, const std::string& instrument) const
+{
     for (const std::pair<std::string, TimeRange>& i : _instrumentTimes) {
-        //check if this instrument is in range
-        if (i.second.includes(time)) {
-            //if so, then get the corresponding spiceID
-            const std::vector<std::string>& ids =
-                _fileTranslation[i.first]->translations();
-            //check which specific subinstrument is firing
-            for (const std::string& s : ids) {
-                if (s == instrumentID) {
-                    return true;
-                }
-            }
+        // check if this instrument is in range
+        if (!i.second.includes(time)) {
+            continue;
+        }
+
+        // if so, then get the corresponding spiceID
+        const std::vector<std::string>& is = _fileTranslation.at(i.first)->translations();
+        // check which specific subinstrument is firing
+        const auto it = std::find(is.begin(), is.end(), instrument);
+        if (it != is.end()) {
+            return true;
         }
     }
     return false;
@@ -203,50 +179,47 @@ float ImageSequencer::instrumentActiveTime(double time,
                                            const std::string& instrumentID) const
 {
     for (const std::pair<std::string, TimeRange>& i : _instrumentTimes) {
-        //check if this instrument is in range
-        if (i.second.includes(time)){
-            //if so, then get the corresponding spiceID
-            const std::vector<std::string>& ids =
-                _fileTranslation.at(i.first)->translations();
+        // check if this instrument is in range
+        if (!i.second.includes(time)) {
+            continue;
+        }
+        // if so, then get the corresponding spiceID
+        const std::vector<std::string>& is = _fileTranslation.at(i.first)->translations();
 
-            // check which specific subinstrument is firing
-            for (const std::string& s : ids) {
-                if (s == instrumentID) {
-                    return static_cast<float>(
-                        (time - i.second.start) / (i.second.end - i.second.start)
-                    );
-                }
-            }
+        // check which specific subinstrument is firing
+        const auto it = std::find(is.begin(), is.end(), instrumentID);
+        if (it != is.end()) {
+            return static_cast<float>(
+                (time - i.second.start) / (i.second.end - i.second.start)
+            );
         }
     }
     return -1.f;
 }
 
-bool ImageSequencer::imagePaths(std::vector<Image>& captures,
-                                const std::string& projectee,
-                                const std::string& instrumentRequest,
-                                double time, double sinceTime)
+std::vector<Image> ImageSequencer::imagePaths(const std::string& projectee,
+                                              const std::string& instrument, double time,
+                                              double sinceTime)
 {
     // TODO: Check how this works with time jumps
 
     // check if this instance is either in range or
     // a valid candidate to recieve data
 
-    const bool instrumentActive = isInstrumentActive(time, instrumentRequest);
+    const bool instrumentActive = isInstrumentActive(time, instrument);
     const bool hasCurrentTime = _subsetMap[projectee]._range.includes(time);
     const bool hasSinceTime = _subsetMap[projectee]._range.includes(sinceTime);
 
     if (!instrumentActive || (!hasCurrentTime && !hasSinceTime)) {
-        return false;
+        return std::vector<Image>();
     }
 
-
     // for readability we store the iterators
     auto begin = _subsetMap[projectee]._subset.begin();
-    auto end   = _subsetMap[projectee]._subset.end();
+    auto end = _subsetMap[projectee]._subset.end();
 
     // create temporary storage
-    std::vector<Image> captureTimes;
+    std::vector<Image> captures;
     // what to look for
     Image findPrevious, findCurrent;
     findPrevious.timeRange.start = sinceTime;
@@ -259,59 +232,52 @@ bool ImageSequencer::imagePaths(std::vector<Image>& captures,
     auto curr = std::lower_bound(begin, end, findCurrent , compareTime);
     auto prev = std::lower_bound(begin, end, findPrevious, compareTime);
 
-    if (curr == begin || curr == end || prev == begin || prev == end || prev >= curr) {
-        return false;
-    }
-
-    if (curr->timeRange.start < prev->timeRange.start) {
-        return false;
+    if (curr == begin || curr == end || prev == begin || prev == end || prev >= curr ||
+        curr->timeRange.start < prev->timeRange.start)
+    {
+        return std::vector<Image>();
     }
 
     std::copy_if(
         prev,
         curr,
-        back_inserter(captureTimes),
-        [instrumentRequest](const Image& i) {
-            return i.activeInstruments[0] == instrumentRequest;
-        }
+        back_inserter(captures),
+        [instrument](const Image& i) { return i.activeInstruments[0] == instrument; }
     );
 
-    captures = captureTimes;
     if (!captures.empty()) {
         _latestImages[captures.back().activeInstruments.front()] = captures.back();
     }
 
     std::vector<int> toDelete;
-    for (auto it = captures.begin(); it != captures.end(); ++it) {
-        if (it->isPlaceholder) {
-            double beforeDist = std::numeric_limits<double>::max();
-            if (it != captures.begin()) {
-                beforeDist = std::abs(
-                    std::prev(it)->timeRange.start - it->timeRange.start
-                );
-            }
+    for (std::vector<Image>::iterator it = captures.begin(); it != captures.end(); ++it) {
+        if (!it->isPlaceholder) {
+            continue;
+        }
 
-            double nextDist = std::numeric_limits<double>::max();
-            if (it != captures.end() - 1) {
-                nextDist = std::abs(
-                    std::next(it)->timeRange.start - it->timeRange.start
-                );
-            }
+        double beforeDist = std::numeric_limits<double>::max();
+        if (it != captures.begin()) {
+            beforeDist = std::abs(std::prev(it)->timeRange.start - it->timeRange.start);
+        }
 
-            if (beforeDist < 1.0 || nextDist < 1.0) {
-                toDelete.push_back(static_cast<int>(std::distance(captures.begin(), it)));
-            }
+        double nextDist = std::numeric_limits<double>::max();
+        if (it != captures.end() - 1) {
+            nextDist = std::abs(std::next(it)->timeRange.start - it->timeRange.start);
+        }
+
+        if (beforeDist < 1.0 || nextDist < 1.0) {
+            toDelete.push_back(static_cast<int>(std::distance(captures.begin(), it)));
         }
     }
 
     for (size_t i = 0; i < toDelete.size(); ++i) {
-        // We have to subtract i here as we already have deleted i value
-        // before this and we need to adjust the location
+        // We have to subtract i here as we already have deleted i value before this and
+        // we need to adjust the location
         int v = toDelete[i] - static_cast<int>(i);
         captures.erase(captures.begin() + v);
     }
 
-    return true;
+    return captures;
 }
 
 void ImageSequencer::sortData() {
@@ -348,15 +314,12 @@ void ImageSequencer::sortData() {
 }
 
 void ImageSequencer::runSequenceParser(SequenceParser& parser) {
-    // get new data
-    std::map<std::string, std::unique_ptr<Decoder>>& translations =
-        parser.translations();
-    std::map<std::string, ImageSubset>& imageData = parser.getSubsetMap();
+    std::map<std::string, std::unique_ptr<Decoder>>& translations = parser.translations();
+    std::map<std::string, ImageSubset>& imageData = parser.subsetMap();
     const std::vector<std::pair<std::string, TimeRange>>& instrumentTimes =
-        parser.getInstrumentTimes();
-    const std::vector<std::pair<double, std::string>>& targetTimes =
-        parser.getTargetTimes();
-    const std::vector<double>& captureProgression = parser.getCaptureProgression();
+        parser.instrumentTimes();
+    const std::vector<std::pair<double, std::string>>& targetTimes = parser.targetTimes();
+    const std::vector<double>& captureProgression = parser.captureProgression();
 
     // check for sanity
     if (imageData.empty() || instrumentTimes.empty() || captureProgression.empty()) {
@@ -382,11 +345,9 @@ void ImageSequencer::runSequenceParser(SequenceParser& parser) {
 
         // simple search function
         double min = 10;
-        auto findMin = [&](const std::vector<Image>& vector) -> double {
-            for (size_t i = 1; i < vector.size(); ++i) {
-                double e = std::abs(
-                    vector[i].timeRange.start - vector[i - 1].timeRange.start
-                );
+        auto findMin = [&](const std::vector<Image>& vec) -> double {
+            for (size_t i = 1; i < vec.size(); ++i) {
+                double e = std::abs(vec[i].timeRange.start - vec[i - 1].timeRange.start);
                 min = std::min(e, min);
             }
             return min;
@@ -394,7 +355,6 @@ void ImageSequencer::runSequenceParser(SequenceParser& parser) {
 
         // find the smallest separation of images in time
         double epsilon;
-        //epsilon = findMin(source);
         epsilon = findMin(destination);
         // set epsilon as 1% smaller than min
         epsilon -= min * 0.01;
@@ -409,8 +369,7 @@ void ImageSequencer::runSequenceParser(SequenceParser& parser) {
                 }
             }
         }
-        // pad image data with predictions (ie - where no actual images,
-        // add placeholder)
+        // pad image data with predictions (ie - where no actual images, add placeholder)
         _subsetMap[key]._subset.insert(
             _subsetMap[key]._subset.end(),
             source.begin(),
@@ -425,11 +384,7 @@ void ImageSequencer::runSequenceParser(SequenceParser& parser) {
         instrumentTimes.begin(),
         instrumentTimes.end()
     );
-    _targetTimes.insert(
-        _targetTimes.end(),
-        targetTimes.begin(),
-        targetTimes.end()
-    );
+    _targetTimes.insert(_targetTimes.end(), targetTimes.begin(), targetTimes.end());
     _captureProgression.insert(
         _captureProgression.end(),
         captureProgression.begin(),
diff --git a/modules/spacecraftinstruments/util/imagesequencer.h b/modules/spacecraftinstruments/util/imagesequencer.h
index 6f5361a38d..9e258310ca 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.h
+++ b/modules/spacecraftinstruments/util/imagesequencer.h
@@ -38,25 +38,25 @@ class Time;
 class SequenceParser;
 
 /**
-* The ImageSequencer singleton main function is to manage the timekeeping and distribution
-* of large image data-sets across all openspace renderable instances, both for past and
-* future unmanned-spacecraft missions. To load the instance with data the client must
-* provide a parser inherited from the abstract base class SequenceParser. Hence, there is
-* no restriction imposed on data input, whether its data in the form of existing images or
-* in the form of a planned observation schedule. Notably, in order for the sequencer to
-* function the client must provide or write a parser that fills the ImageSequencers
-* private members.
-*
-* \see SequenceParser
-* \see ImageSequencer::runSequenceParser(SequenceParser* parser)
-* std::map<std::string, bool>
-*/
+ * The ImageSequencer singleton function is to manage the timekeeping and distribution of
+ * large image data-sets across all openspace renderable instances, both for past and
+ * future unmanned-spacecraft missions. To load the instance with data the client must
+ * provide a parser inherited from the abstract base class SequenceParser. Hence, there is
+ * no restriction imposed on data input, whether its data in the form of existing images or
+ * in the form of a planned observation schedule. Notably, in order for the sequencer to
+ * function the client must provide or write a parser that fills the ImageSequencers
+ * private members.
+ *
+ * \see SequenceParser
+ * \see ImageSequencer::runSequenceParser(SequenceParser* parser)
+ */
 class ImageSequencer {
 public:
     /**
-     * Singelton instantiation
+     * Singleton instantiation
      */
     static ImageSequencer* _instance;
+
     /**
      * Returns the reference to the singleton ImageSequencer object that must have been
      * initialized by a call to the initialize method earlier.
@@ -64,18 +64,21 @@ public:
      * \return The ImageSequencer singleton
      */
     static ImageSequencer& ref();
+
     /**
      * Initializer that initializes the static member.
      */
     static void initialize();
+
     /**
      * Deinitializes that deinitializes the static member.
      */
     static void deinitialize();
+
     /**
      * Returns true if sequencer has been loaded with data.
      */
-    bool isReady();
+    bool isReady() const;
 
     /**
      * Runs parser and recieves the datastructures filled by it.
@@ -86,30 +89,22 @@ public:
     /**
      * Retrieves the next upcoming target in time.
      */
-    std::pair<double, std::string> nextTarget(double time);
+    std::pair<double, std::string> nextTarget(double time) const;
 
     /**
      * Retrieves the most current target in time.
      */
-    std::pair<double, std::string> currentTarget(double time);
+    std::pair<double, std::string> currentTarget(double time) const;
 
     /**
-     * Retrieves current target and (in the list) adjacent targets, the number to retrieve
-     * is user set
+     * Retrieves the time of the previous image capture.
      */
-    std::pair<double, std::vector<std::string>> incidentTargetList(double time,
-                                                                   int range = 2);
+    double prevCaptureTime(double time) const;
 
     /**
      * Retrieves the next upcoming time of image capture.
      */
-    double nextCaptureTime(double time);
-
-    /**
-     * Retrieves the time interval length between the current time and an upcoming
-     * capture.
-     */
-    double intervalLength(double time);
+    double nextCaptureTime(double time) const;
 
     /**
      * Returns a vector with key instrument names whose value indicate whether an
@@ -118,56 +113,54 @@ public:
     std::vector<std::pair<std::string, bool>> activeInstruments(double time);
 
     /**
-     * Retrieves the relevant data from a specific subset based on the what instance
-     * makes the request. If an instance is not registered in the class then the singleton
+     * Retrieves the relevant data from a specific subset based on the what instance makes
+     * the request. If an instance is not registered in the class then the singleton
      * returns false and no projections will occur.
      */
-    bool imagePaths(std::vector<Image>& captures, const std::string& projectee,
-        const std::string& instrumentRequest, double time, double sinceTime);
+    std::vector<Image> imagePaths(const std::string& projectee,
+        const std::string& instrument, double time, double sinceTime);
 
     /**
-     * returns true if instrumentID is within a capture range.
+     * Returns true if instrumentID is within a capture range.
      */
-    bool isInstrumentActive(double time, const std::string& instrumentID);
+    bool isInstrumentActive(double time, const std::string& instrument) const;
 
     float instrumentActiveTime(double time, const std::string& instrumentID) const;
 
     /**
-     * returns latest captured image
+     * Returns latest captured image
      */
-    Image latestImageForInstrument(const std::string& instrumentID);
+    Image latestImageForInstrument(const std::string& instrumentID) const;
 
 private:
     void sortData();
 
     /**
-     * _fileTranslation handles any types of ambiguities between the data and
-     * spice/openspace -calls. This map is composed of a key that is a string in
-     * the data to be translated and a Decoder that holds the corresponding
-     * translation provided through a modfile.
+     * This handles any types of ambiguities between the data and SPICE calls. This map is 
+     * composed of a key that is a string in the data to be translated and a Decoder that
+     * holds the corresponding translation provided through as asset.
      * \see Decoder
-     * \see (projection mod files)
      */
     std::map<std::string, std::unique_ptr<Decoder>> _fileTranslation;
 
     /**
-     * This is the main container of image data. The key is the target name,
-     * the value is a subset of images.
+     * This is the main container of image data. The key is the target name, the value is
+     * a subset of images.
      * \see SequenceParser
      */
     std::map<std::string, ImageSubset> _subsetMap;
 
     /**
-     * In order for the simulation to know when to turn on/off any instrument within
-     * all instruments in the spacecraft payload, the key is the data-file given
-     * instrument name.
+     * In order for the simulation to know when to turn on/off any instrument within all
+     * instruments in the spacecraft payload, the key is the data-file given instrument
+     * name.
      */
     std::vector<std::pair<std::string, bool>> _switchingMap;
 
     /**
      * This datastructure holds the specific times when the spacecraft switches from
-     * observing one inertial body to the next. This happens a lot in such missions
-     * and the coupling of target with specific time is usually therefore not 1:1.
+     * observing one inertial body to the next. This happens a lot in such missions and
+     * the coupling of target with specific time is usually therefore not 1:1.
      */
     std::vector<std::pair<double, std::string>> _targetTimes;
 
@@ -182,14 +175,11 @@ private:
      */
     std::vector<double> _captureProgression;
 
-    // time between current simulation time and an upcoming capture
-    double _intervalLength = 0.0;
-    // next consecutive capture in time
-    double _nextCapture = 0.0;
     // default capture image
     std::string _defaultCaptureImage;
 
     std::map<std::string, Image> _latestImages;
+   
     // if no data, no run
     bool _hasData = false;
 };
diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.cpp b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
index a17d11f1f2..2e61b5474d 100644
--- a/modules/spacecraftinstruments/util/instrumentdecoder.cpp
+++ b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
@@ -57,7 +57,7 @@ InstrumentDecoder::InstrumentDecoder(const ghoul::Dictionary& dictionary) {
         _stopCommand = *p.stopCommand;
     }
     else {
-        LWARNING("Scanner must provide stop command, please check mod file.");
+        LWARNING("Scanner must provide stop command, please check asset file");
     }
 
     _spiceIDs = p.spice;
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index 350a5b73fb..1289b1054f 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -24,22 +24,27 @@
 
 #include <modules/spacecraftinstruments/util/instrumenttimesparser.h>
 
+#include <openspace/documentation/documentation.h>
 #include <openspace/util/spicemanager.h>
 #include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/filesystem/directory.h>
 #include <ghoul/misc/dictionary.h>
+#include <filesystem>
 #include <fstream>
 
 namespace {
     constexpr const char* _loggerCat = "InstrumentTimesParser";
 
-    constexpr const char* KeyTargetBody = "Target.Body";
-    constexpr const char* KeyInstruments = "Instruments";
     constexpr const char* KeyInstrument = "Instrument";
     constexpr const char* KeyInstrumentFiles = "Files";
+
+    struct [[codegen::Dictionary(InstrumentTimesParser)]] Parameters {
+        std::string target;
+        std::map<std::string, ghoul::Dictionary> instruments;
+    };
+#include "instrumenttimesparser_codegen.cpp"
 } // namespace
 
 namespace openspace {
@@ -50,27 +55,24 @@ InstrumentTimesParser::InstrumentTimesParser(std::string name, std::string seque
     , _name(std::move(name))
     , _fileName(std::move(sequenceSource))
 {
+    const Parameters p = codegen::bake<Parameters>(inputDict);
 
-    _target = inputDict.value<std::string>(KeyTargetBody);
-    ghoul::Dictionary instruments = inputDict.value<ghoul::Dictionary>(KeyInstruments);
-
-    for (std::string_view key : instruments.keys()) {
-        ghoul::Dictionary instrument = instruments.value<ghoul::Dictionary>(key);
-        ghoul::Dictionary files = instrument.value<ghoul::Dictionary>(KeyInstrumentFiles);
-        _fileTranslation[std::string(key)] =
-            Decoder::createFromDictionary(instrument, KeyInstrument);
+    _target = p.target;
+    for (const std::pair<const std::string, ghoul::Dictionary>& ps : p.instruments) {
+        ghoul::Dictionary files = ps.second.value<ghoul::Dictionary>(KeyInstrumentFiles);
+        _fileTranslation[ps.first] =
+            Decoder::createFromDictionary(ps.second, KeyInstrument);
         for (size_t i = 0; i < files.size(); i++) {
             std::string filename = files.value<std::string>(std::to_string(i + 1));
-            _instrumentFiles[std::string(key)].push_back(std::move(filename));
+            _instrumentFiles[ps.first].push_back(std::move(filename));
         }
     }
 }
 
 bool InstrumentTimesParser::create() {
-    using RawPath = ghoul::filesystem::Directory::RawPath;
-    ghoul::filesystem::Directory sequenceDir(_fileName, RawPath::Yes);
-    if (!FileSys.directoryExists(sequenceDir)) {
-        LERROR(fmt::format("Could not load Label Directory '{}'", sequenceDir.path()));
+    std::filesystem::path sequenceDir = absPath(_fileName);
+    if (!std::filesystem::is_directory(sequenceDir)) {
+        LERROR(fmt::format("Could not load Label Directory {}", sequenceDir));
         return false;
     }
 
@@ -79,13 +81,10 @@ bool InstrumentTimesParser::create() {
     for (const std::pair<const K, V>& p : _instrumentFiles) {
         const std::string& instrumentID = p.first;
         for (std::string filename : p.second) {
-            std::string filepath = FileSys.pathByAppendingComponent(
-                sequenceDir.path(),
-                std::move(filename)
-            );
+            std::filesystem::path filepath = sequenceDir / filename;
 
-            if (!FileSys.fileExists(filepath)) {
-                LERROR(fmt::format("Unable to read file '{}'. Skipping file", filepath));
+            if (!std::filesystem::is_regular_file(filepath)) {
+                LERROR(fmt::format("Unable to read file {}. Skipping file", filepath));
                 continue;
             }
 
@@ -96,47 +95,46 @@ bool InstrumentTimesParser::create() {
             TimeRange instrumentActiveTimeRange;
             bool successfulRead = true;
             while (std::getline(inFile, line)) {
-                if (std::regex_match(line, matches, _pattern)) {
-                    if (matches.size() != 3) {
-                        LERROR(
-                            "Bad event data formatting. Must \
-                            have regex 3 matches (source string, start time, stop time)."
-                        );
-                        successfulRead = false;
-                        break;
-                    }
-
-                    TimeRange captureTimeRange;
-                    try { // parse date strings
-                        std::string start = matches[1].str();
-                        std::string stop = matches[2].str();
-                        captureTimeRange.start =
-                            SpiceManager::ref().ephemerisTimeFromDate(start);
-                        captureTimeRange.end =
-                            SpiceManager::ref().ephemerisTimeFromDate(stop);
-                    }
-                    catch (const SpiceManager::SpiceException& e) {
-                        LERROR(e.what());
-                        successfulRead = false;
-                        break;
-                    }
-
-                    instrumentActiveTimeRange.include(captureTimeRange);
-
-                    //_instrumentTimes.push_back({ instrumentID, timeRange });
-                    _targetTimes.emplace_back(captureTimeRange.start, _target);
-                    _captureProgression.push_back(captureTimeRange.start);
-
-                    Image image = {
-                        captureTimeRange,
-                        std::string(),
-                        { instrumentID },
-                        _target,
-                        true,
-                        false
-                    };
-                    _subsetMap[_target]._subset.push_back(std::move(image));
+                if (!std::regex_match(line, matches, _pattern)) {
+                    continue;
                 }
+
+                if (matches.size() != 3) {
+                    LERROR(
+                        "Bad event data formatting. Must have regex 3 matches "
+                        "(source string, start time, stop time)"
+                    );
+                    successfulRead = false;
+                    break;
+                }
+
+                TimeRange tr;
+                try { // parse date strings
+                    std::string start = matches[1].str();
+                    std::string stop = matches[2].str();
+                    tr.start = SpiceManager::ref().ephemerisTimeFromDate(start);
+                    tr.end = SpiceManager::ref().ephemerisTimeFromDate(stop);
+                }
+                catch (const SpiceManager::SpiceException& e) {
+                    LERROR(e.what());
+                    successfulRead = false;
+                    break;
+                }
+
+                instrumentActiveTimeRange.include(tr);
+
+                _targetTimes.emplace_back(tr.start, _target);
+                _captureProgression.push_back(tr.start);
+
+                Image image = {
+                    tr,
+                    std::string(),
+                    { instrumentID },
+                    _target,
+                    true,
+                    false
+                };
+                _subsetMap[_target]._subset.push_back(std::move(image));
             }
             if (successfulRead){
                 _subsetMap[_target]._range.include(instrumentActiveTimeRange);
@@ -150,7 +148,7 @@ bool InstrumentTimesParser::create() {
         _targetTimes.begin(),
         _targetTimes.end(),
         [](const std::pair<double, std::string>& a,
-           const std::pair<double, std::string>& b) -> bool
+           const std::pair<double, std::string>& b)
         {
             return a.first < b.first;
         }
diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp
index f8c2360224..e9469306c1 100644
--- a/modules/spacecraftinstruments/util/labelparser.cpp
+++ b/modules/spacecraftinstruments/util/labelparser.cpp
@@ -26,17 +26,17 @@
 
 #include <openspace/util/spicemanager.h>
 #include <ghoul/fmt.h>
-#include <ghoul/filesystem/directory.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
+#include <filesystem>
 #include <fstream>
 
 namespace {
     constexpr const char* _loggerCat = "LabelParser";
-    constexpr const char* keySpecs   = "Read";
+    constexpr const char* keySpecs = "Read";
     constexpr const char* keyConvert = "Convert";
 } // namespace
 
@@ -44,8 +44,7 @@ namespace openspace {
 
 LabelParser::LabelParser(std::string name, std::string fileName,
                          const ghoul::Dictionary& dictionary)
-    : _name(std::move(name))
-    , _fileName(std::move(fileName))
+    : _fileName(std::move(fileName))
 {
     // get the different instrument types
     // for each decoder (assuming might have more if hong makes changes)
@@ -121,7 +120,6 @@ std::string LabelParser::decode(const std::string& line) {
         if (value != std::string::npos) {
             std::string toTranslate = line.substr(value);
             return _fileTranslation[toTranslate]->translations()[0];
-
         }
     }
     return "";
@@ -140,45 +138,41 @@ std::string LabelParser::encode(const std::string& line) const {
 }
 
 bool LabelParser::create() {
-    using RawPath = ghoul::filesystem::Directory::RawPath;
-    ghoul::filesystem::Directory sequenceDir(_fileName, RawPath::Yes);
-    if (!FileSys.directoryExists(sequenceDir)) {
-        LERROR(fmt::format("Could not load Label Directory '{}'", sequenceDir.path()));
+    std::filesystem::path sequenceDir = absPath(_fileName);
+    if (!std::filesystem::is_directory(sequenceDir)) {
+        LERROR(fmt::format("Could not load Label Directory {}", sequenceDir));
         return false;
     }
 
-    std::string previousTarget;
     std::string lblName;
+    namespace fs = std::filesystem;
+    for (const fs::directory_entry& e : fs::recursive_directory_iterator(sequenceDir)) {
+        if (!e.is_regular_file()) {
+            continue;
+        }
 
+        std::string path = e.path().string();
 
-    using Recursive = ghoul::filesystem::Directory::Recursive;
-    using Sort = ghoul::filesystem::Directory::Sort;
-    std::vector<std::string> sequencePaths = sequenceDir.read(Recursive::Yes, Sort::No);
-    for (const std::string& path : sequencePaths) {
         size_t position = path.find_last_of('.') + 1;
         if (position == 0 || position == std::string::npos) {
             continue;
         }
 
-        ghoul::filesystem::File currentFile(path);
-        const std::string& extension = currentFile.fileExtension();
-
-        if (extension != "lbl" && extension != "LBL") {
+        std::filesystem::path extension = std::filesystem::path(path).extension();
+        if (extension != ".lbl" && extension != ".LBL") {
             continue;
         }
 
-        std::ifstream file(currentFile.path());
+        std::ifstream file(path);
 
         if (!file.good()) {
-            LERROR(fmt::format("Failed to open label file '{}'", currentFile.path()));
+            LERROR(fmt::format("Failed to open label file '{}'", path));
             return false;
         }
 
         int count = 0;
 
         // open up label files
-        //TimeRange instrumentRange;
-
         double startTime = 0.0;
         double stopTime = 0.0;
         std::string line;
@@ -191,14 +185,14 @@ bool LabelParser::create() {
 
             std::string read = line.substr(0, line.find_first_of('='));
 
-            _detectorType = "CAMERA"; //default value
+            _detectorType = "CAMERA"; // default value
 
             constexpr const char* ErrorMsg =
                 "Unrecognized '{}' in line {} in file {}. The 'Convert' table must "
                 "contain the identity tranformation for all values encountered in the "
                 "label files, for example: ROSETTA = {{ \"ROSETTA\" }}";
 
-            /* Add more  */
+            // Add more
             if (read == "TARGET_NAME") {
                 _target = decode(line);
                 if (_target.empty()) {
@@ -235,7 +229,7 @@ bool LabelParser::create() {
                 startTime = SpiceManager::ref().ephemerisTimeFromDate(start);
                 count++;
 
-                getline(file, line);
+                std::getline(file, line);
                 line.erase(std::remove(line.begin(), line.end(), '"'), line.end());
                 line.erase(std::remove(line.begin(), line.end(), ' '), line.end());
                 line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
@@ -256,7 +250,7 @@ bool LabelParser::create() {
                 }
                 else{
                     LERROR(fmt::format(
-                        "Label file {} deviates from generic standard", currentFile.path()
+                        "Label file {} deviates from generic standard", path
                     ));
                     LINFO(
                         "Please make sure input data adheres to format from \
@@ -274,7 +268,7 @@ bool LabelParser::create() {
                 std::string p = path.substr(0, path.size() - ("lbl"s).size());
                 for (const std::string& ext : extensions) {
                     std::string imagePath = p + ext;
-                    if (FileSys.fileExists(imagePath)) {
+                    if (std::filesystem::is_regular_file(imagePath)) {
                         std::vector<std::string> spiceInstrument;
                         spiceInstrument.push_back(_instrumentID);
 
@@ -317,20 +311,23 @@ bool LabelParser::create() {
         }
     );
 
+    std::string previousTarget;
     for (const Image& image : tmp) {
-        if (previousTarget != image.target) {
-            previousTarget = image.target;
-            _targetTimes.emplace_back(image.timeRange.start , image.target);
-            std::sort(
-                _targetTimes.begin(),
-                _targetTimes.end(),
-                [](const std::pair<double, std::string> &a,
-                   const std::pair<double, std::string> &b) -> bool
-                {
-                    return a.first < b.first;
-                }
-            );
+        if (previousTarget == image.target) {
+            continue;
         }
+
+        previousTarget = image.target;
+        _targetTimes.emplace_back(image.timeRange.start , image.target);
+        std::sort(
+            _targetTimes.begin(),
+            _targetTimes.end(),
+            [](const std::pair<double, std::string>& a,
+               const std::pair<double, std::string>& b) -> bool
+            {
+                return a.first < b.first;
+            }
+        );
     }
 
     for (const std::pair<const std::string, ImageSubset>& target : _subsetMap) {
diff --git a/modules/spacecraftinstruments/util/labelparser.h b/modules/spacecraftinstruments/util/labelparser.h
index 4e9667f2e8..7478fb236f 100644
--- a/modules/spacecraftinstruments/util/labelparser.h
+++ b/modules/spacecraftinstruments/util/labelparser.h
@@ -36,30 +36,17 @@ public:
 
     bool create() override;
 
-    // temporary need to figure this out
-    //std::map<std::string, Decoder*> translations() { return _fileTranslation; };
-
 private:
-    void createImage(Image& image, double startTime, double stopTime,
-        std::vector<std::string> instr, std::string target, std::string path);
-
     std::string encode(const std::string& line) const;
     std::string decode(const std::string& line);
 
-    bool augmentWithSpice(Image& image, std::string spacecraft,
-        std::vector<std::string> payload, std::vector<std::string> potentialTargets);
-
-    std::string _name;
     std::string _fileName;
-    std::string _spacecraft;
     std::vector<std::string> _specsOfInterest;
 
     std::string _target;
     std::string _instrumentID;
     std::string _instrumentHostID;
     std::string _detectorType;
-    std::string _sequenceID;
-    bool _badDecoding = false;
 };
 
 } // namespace openspace
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index 83ef37f558..3e48f3eba8 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -30,11 +30,8 @@
 #include <modules/spacecraftinstruments/util/labelparser.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
-#include <openspace/scene/scenegraphnode.h>
-#include <ghoul/glm.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/io/texture/texturereader.h>
-#include <ghoul/misc/dictionary.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/framebufferobject.h>
@@ -43,11 +40,8 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/systemcapabilities/openglcapabilitiescomponent.h>
 #include <optional>
-#include <variant>
 
 namespace {
-    constexpr const char* keyTranslation = "DataInputTranslation";
-    constexpr const char* keyTimesTranslation = "TimesDataInputTranslation";
     constexpr const char* placeholderFile = "${DATA}/placeholder.png";
 
     constexpr const char* _loggerCat = "ProjectionComponent";
@@ -157,6 +151,10 @@ namespace {
         // as planets usually have 2x1 aspect ratios, whereas this does not hold for 
         // non-planet objects (comets, asteroids, etc). The default value is '1.0'
         std::optional<float> aspectRatio;
+
+        std::optional<ghoul::Dictionary> dataInputTranslation;
+
+        std::optional<ghoul::Dictionary> timesDataInputTranslation;
     };
 #include "projectioncomponent_codegen.cpp"
 } // namespace
@@ -164,9 +162,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation ProjectionComponent::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "newhorizons_projectioncomponent";
-    return doc;
+    return codegen::doc<Parameters>("newhorizons_projectioncomponent");
 }
 
 ProjectionComponent::ProjectionComponent()
@@ -214,7 +210,7 @@ void ProjectionComponent::initialize(const std::string& identifier,
 
     std::vector<std::string> sequenceSources;
     if (std::holds_alternative<std::string>(sequence)) {
-        sequenceSources.push_back(absPath(std::get<std::string>(sequence)));
+        sequenceSources.push_back(absPath(std::get<std::string>(sequence)).string());
     }
     else {
         ghoul_assert(
@@ -223,7 +219,7 @@ void ProjectionComponent::initialize(const std::string& identifier,
         );
         sequenceSources = std::get<std::vector<std::string>>(sequence);
         for (std::string& s : sequenceSources) {
-            s = absPath(s);
+            s = absPath(s).string();
         }
     }
 
@@ -232,25 +228,25 @@ void ProjectionComponent::initialize(const std::string& identifier,
         throw ghoul::RuntimeError("Missing SequenceType");
     }
 
-    ghoul::Dictionary translationDictionary;
-    if (dictionary.hasValue<ghoul::Dictionary>(keyTranslation)) {
-        translationDictionary = dictionary.value<ghoul::Dictionary>(keyTranslation);
+    ghoul::Dictionary translations;
+    if (p.dataInputTranslation.has_value()) {
+        translations = *p.dataInputTranslation;
     }
     else {
-        LWARNING("No playbook translation provided, spice calls must match playbook!");
+        LWARNING("No playbook translation provided, SPICE calls must match playbook");
         return;
     }
 
     std::vector<std::unique_ptr<SequenceParser>> parsers;
-    for (std::string& sequenceSource : sequenceSources) {
+    for (std::string& source : sequenceSources) {
         switch (*p.sequenceType) {
             case Parameters::Type::Playbook:
                 parsers.push_back(
                     std::make_unique<HongKangParser>(
                         identifier,
-                        std::move(sequenceSource),
+                        std::move(source),
                         _projectorID,
-                        translationDictionary,
+                        translations,
                         _potentialTargets
                     )
                 );
@@ -259,8 +255,8 @@ void ProjectionComponent::initialize(const std::string& identifier,
                 parsers.push_back(
                     std::make_unique<LabelParser>(
                         identifier,
-                        std::move(sequenceSource),
-                        translationDictionary
+                        std::move(source),
+                        translations
                     )
                 );
                 break;
@@ -269,8 +265,8 @@ void ProjectionComponent::initialize(const std::string& identifier,
                 parsers.push_back(
                     std::make_unique<LabelParser>(
                         identifier,
-                        std::move(sequenceSource),
-                        translationDictionary
+                        std::move(source),
+                        translations
                     )
                 );
 
@@ -278,9 +274,9 @@ void ProjectionComponent::initialize(const std::string& identifier,
                     parsers.push_back(
                         std::make_unique<HongKangParser>(
                             identifier,
-                            absPath(*p.eventFile),
+                            absPath(*p.eventFile).string(),
                             _projectorID,
-                            translationDictionary,
+                            translations,
                             _potentialTargets
                         )
                     );
@@ -293,8 +289,8 @@ void ProjectionComponent::initialize(const std::string& identifier,
                 parsers.push_back(
                     std::make_unique<InstrumentTimesParser>(
                         identifier,
-                        std::move(sequenceSource),
-                        translationDictionary
+                        std::move(source),
+                        translations
                     )
                 );
                 break;
@@ -303,24 +299,24 @@ void ProjectionComponent::initialize(const std::string& identifier,
                 parsers.push_back(
                     std::make_unique<LabelParser>(
                         identifier,
-                        std::move(sequenceSource),
-                        translationDictionary
+                        std::move(source),
+                        translations
                     )
                 );
 
                 if (!p.timesSequence.has_value()) {
                     throw ghoul::RuntimeError("Could not find required TimesSequence");
                 }
+
                 ghoul::Dictionary timesTranslationDictionary;
-                if (dictionary.hasValue<ghoul::Dictionary>(keyTimesTranslation)) {
-                    timesTranslationDictionary =
-                        dictionary.value<ghoul::Dictionary>(keyTimesTranslation);
+                if (p.timesDataInputTranslation.has_value()) {
+                    timesTranslationDictionary = *p.timesDataInputTranslation;
                 }
 
                 parsers.push_back(
                     std::make_unique<InstrumentTimesParser>(
                         identifier,
-                        absPath(*p.timesSequence),
+                        absPath(*p.timesSequence).string(),
                         timesTranslationDictionary
                     )
                 );
@@ -331,11 +327,11 @@ void ProjectionComponent::initialize(const std::string& identifier,
 
     for (std::unique_ptr<SequenceParser>& parser : parsers) {
         bool success = parser->create();
-        if (!success) {
-            LERROR("One or more sequence loads failed; please check mod files");
+        if (success) {
+            ImageSequencer::ref().runSequenceParser(*parser);
         }
         else {
-            ImageSequencer::ref().runSequenceParser(*parser);
+            LERROR("One or more sequence loads failed; please check asset files");
         }
     }
     parsers.clear();
@@ -365,12 +361,10 @@ bool ProjectionComponent::initializeGL() {
     success &= auxiliaryRendertarget();
     success &= depthRendertarget();
 
-    using std::unique_ptr;
     using ghoul::opengl::Texture;
-    using ghoul::io::TextureReader;
 
-    unique_ptr<Texture> texture = TextureReader::ref().loadTexture(
-        absPath(placeholderFile)
+    std::unique_ptr<Texture> texture = ghoul::io::TextureReader::ref().loadTexture(
+        absPath(placeholderFile).string()
     );
     if (texture) {
         texture->uploadTexture();
@@ -387,12 +381,12 @@ bool ProjectionComponent::initializeGL() {
         );
 
         const GLfloat plane[] = {
-            -1, -1,
-            1,  1,
-            -1,  1,
-            -1, -1,
-            1, -1,
-            1,  1,
+            -1.0, -1.0,
+             1.0,  1.0,
+            -1.0,  1.0,
+            -1.0, -1.0,
+             1.0, -1.0,
+             1.0,  1.0,
         };
 
         glGenVertexArrays(1, &_dilation.vao);
@@ -402,22 +396,14 @@ bool ProjectionComponent::initializeGL() {
         glBindBuffer(GL_ARRAY_BUFFER, _dilation.vbo);
         glBufferData(GL_ARRAY_BUFFER, sizeof(plane), plane, GL_STATIC_DRAW);
         glEnableVertexAttribArray(0);
-        glVertexAttribPointer(
-            0,
-            2,
-            GL_FLOAT,
-            GL_FALSE,
-            sizeof(GLfloat) * 2,
-            nullptr
-        );
-
+        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), nullptr);
         glBindVertexArray(0);
     }
 
     return success;
 }
 
-bool ProjectionComponent::deinitialize() {
+void ProjectionComponent::deinitialize() {
     _projectionTexture = nullptr;
 
     glDeleteFramebuffers(1, &_fboID);
@@ -430,8 +416,6 @@ bool ProjectionComponent::deinitialize() {
         _dilation.program = nullptr;
         _dilation.texture = nullptr;
     }
-
-    return true;
 }
 
 bool ProjectionComponent::isReady() const {
@@ -443,11 +427,8 @@ void ProjectionComponent::imageProjectBegin() {
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO);
 
     if (_textureSizeDirty) {
-        LDEBUG(
-            fmt::format(
-                "Changing texture size to {}", ghoul::to_string(_textureSize.value())
-            )
-        );
+        glm::ivec2 size = _textureSize;
+        LDEBUG(fmt::format("Changing texture size to {}, {}", size.x, size.y));
 
         // If the texture size has changed, we have to allocate new memory and copy
         // the image texture to the new target
@@ -469,35 +450,21 @@ void ProjectionComponent::imageProjectBegin() {
         }
 
         auto copyFramebuffers = [](Texture* src, Texture* dst, const std::string& msg) {
-            glFramebufferTexture(
-                GL_READ_FRAMEBUFFER,
-                GL_COLOR_ATTACHMENT0,
-                *src,
-                0
-            );
+            glFramebufferTexture(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, *src, 0);
 
             GLenum status = glCheckFramebufferStatus(GL_READ_FRAMEBUFFER);
             if (!FramebufferObject::errorChecking(status).empty()) {
                 LERROR(fmt::format(
-                    "Read Buffer ({}): {}",
-                    msg,
-                    FramebufferObject::errorChecking(status)
+                    "Read Buffer ({}): {}", msg, FramebufferObject::errorChecking(status)
                 ));
             }
 
-            glFramebufferTexture(
-                GL_DRAW_FRAMEBUFFER,
-                GL_COLOR_ATTACHMENT0,
-                *dst,
-                0
-            );
+            glFramebufferTexture(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, *dst, 0);
 
             status = glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER);
             if (!FramebufferObject::errorChecking(status).empty()) {
                 LERROR(fmt::format(
-                    "Draw Buffer ({}): {}",
-                    msg,
-                    FramebufferObject::errorChecking(status)
+                    "Draw Buffer ({}): {}", msg, FramebufferObject::errorChecking(status)
                 ));
             }
 
@@ -512,35 +479,21 @@ void ProjectionComponent::imageProjectBegin() {
         };
 
         auto copyDepthBuffer = [](Texture* src, Texture* dst, const std::string& msg) {
-            glFramebufferTexture(
-                GL_READ_FRAMEBUFFER,
-                GL_DEPTH_ATTACHMENT,
-                *src,
-                0
-            );
+            glFramebufferTexture(GL_READ_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, *src, 0);
 
             GLenum status = glCheckFramebufferStatus(GL_READ_FRAMEBUFFER);
             if (!FramebufferObject::errorChecking(status).empty()) {
                 LERROR(fmt::format(
-                    "Read Buffer ({}): {}",
-                    msg,
-                    FramebufferObject::errorChecking(status)
+                    "Read Buffer ({}): {}", msg, FramebufferObject::errorChecking(status)
                 ));
             }
 
-            glFramebufferTexture(
-                GL_DRAW_FRAMEBUFFER,
-                GL_DEPTH_ATTACHMENT,
-                *dst,
-                0
-            );
+            glFramebufferTexture(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, *dst, 0);
 
             status = glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER);
             if (!FramebufferObject::errorChecking(status).empty()) {
                 LERROR(fmt::format(
-                    "Draw Buffer ({}): {}",
-                    msg,
-                    FramebufferObject::errorChecking(status)
+                    "Draw Buffer ({}): {}", msg, FramebufferObject::errorChecking(status)
                 ));
             }
 
@@ -580,11 +533,7 @@ void ProjectionComponent::imageProjectBegin() {
         }
 
         if (_shadowing.isEnabled) {
-            copyDepthBuffer(
-                oldDepthTexture.get(),
-                _shadowing.texture.get(),
-                "Shadowing"
-            );
+            copyDepthBuffer(oldDepthTexture.get(), _shadowing.texture.get(), "Shadowing");
         }
 
         glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
@@ -671,7 +620,7 @@ void ProjectionComponent::depthMapRenderBegin() {
         0, 0,
         static_cast<GLsizei>(_shadowing.texture->width()),
         static_cast<GLsizei>(_shadowing.texture->height())
-        );
+    );
 
     glClear(GL_DEPTH_BUFFER_BIT);
 }
@@ -729,7 +678,8 @@ bool ProjectionComponent::depthRendertarget() {
         GL_DEPTH_ATTACHMENT,
         GL_TEXTURE_2D,
         *_shadowing.texture,
-        0);
+        0
+    );
 
     glDrawBuffer(GL_NONE);
 
@@ -816,9 +766,9 @@ glm::mat4 ProjectionComponent::computeProjectorMatrix(const glm::vec3 loc, glm::
                                                       glm::vec3& boreSight)
 {
 
-    //rotate boresight into correct alignment
-    boreSight = instrumentMatrix*aim;
-    glm::vec3 uptmp(instrumentMatrix*glm::dvec3(up));
+    // rotate boresight into correct alignment
+    boreSight = instrumentMatrix * aim;
+    glm::vec3 uptmp = instrumentMatrix * glm::dvec3(up);
 
     // create view matrix
     glm::vec3 e3 = glm::normalize(-boreSight);
@@ -836,7 +786,7 @@ glm::mat4 ProjectionComponent::computeProjectorMatrix(const glm::vec3 loc, glm::
         glm::radians(fieldOfViewY), aspectRatio, nearPlane, farPlane
     );
 
-    return projProjectionMatrix*projViewMatrix;
+    return projProjectionMatrix * projViewMatrix;
 }
 
 bool ProjectionComponent::doesPerformProjection() const {
@@ -914,15 +864,13 @@ void ProjectionComponent::clearAllProjections() {
     }
 
     glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO);
-    glViewport(m_viewport[0], m_viewport[1],
-               m_viewport[2], m_viewport[3]);
+    glViewport(m_viewport[0], m_viewport[1], m_viewport[2], m_viewport[3]);
 
     _clearAllProjections = false;
     _mipMapDirty = true;
 }
 
 void ProjectionComponent::generateMipMap() {
-
     _projectionTexture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
     _mipMapDirty = false;
 }
@@ -931,17 +879,15 @@ std::shared_ptr<ghoul::opengl::Texture> ProjectionComponent::loadProjectionTextu
                                                            const std::string& texturePath,
                                                            bool isPlaceholder)
 {
-    using std::unique_ptr;
     using ghoul::opengl::Texture;
-    using ghoul::io::TextureReader;
-
 
     if (isPlaceholder) {
         return _placeholderTexture;
     }
 
-
-    unique_ptr<Texture> texture = TextureReader::ref().loadTexture(absPath(texturePath));
+    std::unique_ptr<Texture> texture = ghoul::io::TextureReader::ref().loadTexture(
+        absPath(texturePath).string()
+    );
     if (texture) {
         if (texture->format() == Texture::Format::Red) {
             ghoul::opengl::convertTextureFormat(*texture, Texture::Format::RGB);
@@ -975,23 +921,16 @@ bool ProjectionComponent::generateProjectionLayerTexture(const glm::ivec2& size)
 
         if (_dilation.texture) {
             _dilation.texture->uploadTexture();
-            //_dilation.texture->setFilter(
-            //    ghoul::opengl::Texture::FilterMode::AnisotropicMipMap
-            //);
         }
 
         _dilation.stencilTexture = std::make_unique<ghoul::opengl::Texture>(
             glm::uvec3(size, 1),
             ghoul::opengl::Texture::Format::Red,
-            // @TODO: Remove the static cast ---abock
             static_cast<GLenum>(ghoul::opengl::Texture::Format::Red)
         );
 
         if (_dilation.stencilTexture) {
             _dilation.stencilTexture->uploadTexture();
-            //_dilation.texture->setFilter(
-            //    ghoul::opengl::Texture::FilterMode::AnisotropicMipMap
-            //);
         }
     }
 
@@ -1012,7 +951,6 @@ bool ProjectionComponent::generateDepthTexture(const glm::ivec2& size) {
     }
 
     return _shadowing.texture != nullptr;
-
 }
 
 } // namespace openspace
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.h b/modules/spacecraftinstruments/util/projectioncomponent.h
index 322b9eaf5b..be96533758 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.h
+++ b/modules/spacecraftinstruments/util/projectioncomponent.h
@@ -50,7 +50,7 @@ public:
 
     void initialize(const std::string& identifier, const ghoul::Dictionary& dictionary);
     bool initializeGL();
-    bool deinitialize();
+    void deinitialize();
 
     bool isReady() const;
 
diff --git a/modules/spacecraftinstruments/util/scannerdecoder.cpp b/modules/spacecraftinstruments/util/scannerdecoder.cpp
index c7ccf2bc50..53aef7b2bf 100644
--- a/modules/spacecraftinstruments/util/scannerdecoder.cpp
+++ b/modules/spacecraftinstruments/util/scannerdecoder.cpp
@@ -26,15 +26,19 @@
 
 #include <ghoul/misc/dictionary.h>
 
+namespace {
+    std::string Type = "SCANNER";
+} // namespace
+
 namespace openspace {
 
-ScannerDecoder::ScannerDecoder(const ghoul::Dictionary& dictionary) : _type("SCANNER") {
+ScannerDecoder::ScannerDecoder(const ghoul::Dictionary& dictionary) {
     for (size_t k = 0; k < dictionary.size(); k++) {
         _spiceIDs.push_back(dictionary.value<std::string>(std::to_string(k + 1)));
     }
 }
 const std::string& ScannerDecoder::decoderType() const {
-    return _type;
+    return Type;
 }
 
 const std::vector<std::string>& ScannerDecoder::spiceIDs() const {
diff --git a/modules/spacecraftinstruments/util/scannerdecoder.h b/modules/spacecraftinstruments/util/scannerdecoder.h
index 75b0f2e663..15b19cc1ef 100644
--- a/modules/spacecraftinstruments/util/scannerdecoder.h
+++ b/modules/spacecraftinstruments/util/scannerdecoder.h
@@ -37,11 +37,9 @@ public:
 
     virtual const std::string& decoderType() const override;
     const std::vector<std::string>& spiceIDs() const;
-    const std::string& stopCommand() const;
     void setStopCommand(std::string stopCommand);
 
 private:
-    std::string _type;
     std::string _abort;
     std::vector<std::string> _spiceIDs;
 };
diff --git a/modules/spacecraftinstruments/util/sequenceparser.cpp b/modules/spacecraftinstruments/util/sequenceparser.cpp
index 59ebc56128..c8ea3d79ed 100644
--- a/modules/spacecraftinstruments/util/sequenceparser.cpp
+++ b/modules/spacecraftinstruments/util/sequenceparser.cpp
@@ -27,26 +27,23 @@
 #include <openspace/engine/globals.h>
 #include <openspace/util/spicemanager.h>
 #include <ghoul/logging/logmanager.h>
-#include <cstring>
 
 namespace openspace {
 
-std::map<std::string, ImageSubset>& SequenceParser::getSubsetMap() {
+std::map<std::string, ImageSubset>& SequenceParser::subsetMap() {
     return _subsetMap;
 }
 
 const std::vector<std::pair<std::string, TimeRange>>&
-SequenceParser::getInstrumentTimes() const
+SequenceParser::instrumentTimes() const
 {
     return _instrumentTimes;
 }
-const std::vector<std::pair<double, std::string>>&
-SequenceParser::getTargetTimes() const
-{
+const std::vector<std::pair<double, std::string>>& SequenceParser::targetTimes() const {
     return _targetTimes;
 }
 
-const std::vector<double>& SequenceParser::getCaptureProgression() const {
+const std::vector<double>& SequenceParser::captureProgression() const {
     return _captureProgression;
 }
 
diff --git a/modules/spacecraftinstruments/util/sequenceparser.h b/modules/spacecraftinstruments/util/sequenceparser.h
index d90005da5a..ba4162034d 100644
--- a/modules/spacecraftinstruments/util/sequenceparser.h
+++ b/modules/spacecraftinstruments/util/sequenceparser.h
@@ -26,9 +26,8 @@
 #define __OPENSPACE_MODULE_SPACECRAFTINSTRUMENTS___SEQUENCEPARSER___H__
 
 #include <modules/spacecraftinstruments/util/decoder.h>
-#include <openspace/util/timerange.h>
 #include <modules/spacecraftinstruments/util/image.h>
-
+#include <openspace/util/timerange.h>
 #include <map>
 #include <memory>
 #include <string>
@@ -40,11 +39,12 @@ class SequenceParser {
 public:
     virtual ~SequenceParser() = default;
     virtual bool create() = 0;
-    std::map<std::string, ImageSubset>& getSubsetMap();
-    const std::vector<std::pair<std::string, TimeRange>>& getInstrumentTimes() const;
-    const std::vector<std::pair<double, std::string>>& getTargetTimes() const ;
+
+    std::map<std::string, ImageSubset>& subsetMap();
+    const std::vector<std::pair<std::string, TimeRange>>& instrumentTimes() const;
+    const std::vector<std::pair<double, std::string>>& targetTimes() const ;
     std::map<std::string, std::unique_ptr<Decoder>>& translations();
-    const std::vector<double>& getCaptureProgression() const;
+    const std::vector<double>& captureProgression() const;
 
 protected:
     std::map<std::string, ImageSubset> _subsetMap;
diff --git a/modules/spacecraftinstruments/util/targetdecoder.cpp b/modules/spacecraftinstruments/util/targetdecoder.cpp
index 4f69884f77..ee8ff4c514 100644
--- a/modules/spacecraftinstruments/util/targetdecoder.cpp
+++ b/modules/spacecraftinstruments/util/targetdecoder.cpp
@@ -26,21 +26,24 @@
 
 #include <ghoul/misc/dictionary.h>
 
+namespace {
+    std::string Type = "TARGET";
+} // namespace
+
 namespace openspace {
 
-TargetDecoder::TargetDecoder(const ghoul::Dictionary& dictionary) : _type("TARGET") {
+TargetDecoder::TargetDecoder(const ghoul::Dictionary& dictionary) {
     _names.resize(dictionary.size());
     for (size_t i = 0; i < _names.size(); ++i) {
         std::string key = std::to_string(i + 1);
         if (dictionary.hasKey(key) && dictionary.hasValue<std::string>(key)) {
-            std::string readMe = dictionary.value<std::string>(key);
-            _names[i] = readMe;
+            _names[i] = dictionary.value<std::string>(key);;
         }
     }
 }
 
 const std::string& TargetDecoder::decoderType() const {
-    return _type;
+    return Type;
 }
 
 const std::vector<std::string>& TargetDecoder::translations() const {
diff --git a/modules/spacecraftinstruments/util/targetdecoder.h b/modules/spacecraftinstruments/util/targetdecoder.h
index e26f9ebb7c..0894b2a36c 100644
--- a/modules/spacecraftinstruments/util/targetdecoder.h
+++ b/modules/spacecraftinstruments/util/targetdecoder.h
@@ -37,7 +37,6 @@ public:
     virtual const std::vector<std::string>& translations() const override;
 
 private:
-    std::string _type;
     std::vector<std::string> _names;
 };
 
diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp
index 12e539409f..141ba1298e 100644
--- a/modules/spout/renderableplanespout.cpp
+++ b/modules/spout/renderableplanespout.cpp
@@ -29,12 +29,11 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <ghoul/logging/logmanager.h>
+#include <optional>
 
 namespace {
     constexpr const char* LoggerCat = "ScreenSpaceSpout";
 
-    constexpr const char* KeyName = "Name";
-
     constexpr openspace::properties::Property::PropertyInfo NameInfo = {
         "SpoutName",
         "Spout Sender Name",
@@ -56,30 +55,18 @@ namespace {
         "If this property is trigged, the 'SpoutSelection' options will be refreshed."
     };
 
+    struct [[codegen::Dictionary(RenderablePlaneSpout)]] Parameters {
+        // [[codegen::verbatim(NameInfo.description)]]
+        std::optional<std::string> spoutName;
+    };
+#include "renderableplanespout_codegen.cpp"
+
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderablePlaneSpout::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "ScreenSpace Spout",
-        "spout_screenspace_spout",
-        {
-            {
-                KeyName,
-                new StringVerifier,
-                Optional::Yes,
-                "Specifies the GUI name of the ScreenspaceSpout"
-            },
-            {
-                NameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                NameInfo.description
-            }
-        }
-    };
+    return codegen::doc<Parameters>("spout_screenspace_spout");
 }
 
 RenderablePlaneSpout::RenderablePlaneSpout(const ghoul::Dictionary& dictionary)
@@ -89,11 +76,7 @@ RenderablePlaneSpout::RenderablePlaneSpout(const ghoul::Dictionary& dictionary)
     , _updateSelection(UpdateInfo)
     , _receiver(GetSpout())
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderablePlaneSpout"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     int iIdentifier = 0;
     if (_identifier.empty()) {
@@ -114,10 +97,7 @@ RenderablePlaneSpout::RenderablePlaneSpout(const ghoul::Dictionary& dictionary)
         setGuiName("RenderablePlaneSpout " + std::to_string(iIdentifier));
     }
 
-    if (dictionary.hasKey(NameInfo.identifier)) {
-        _spoutName = dictionary.value<std::string>(NameInfo.identifier);
-    }
-
+    _spoutName = p.spoutName.value_or(_spoutName);
     _spoutName.onChange([this]() {
         _isSpoutDirty = true;
         _isErrorMessageDisplayed = false;
diff --git a/modules/spout/screenspacespout.cpp b/modules/spout/screenspacespout.cpp
index b47d28dff3..2aabb89cde 100644
--- a/modules/spout/screenspacespout.cpp
+++ b/modules/spout/screenspacespout.cpp
@@ -29,10 +29,9 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <ghoul/logging/logmanager.h>
+#include <optional>
 
 namespace {
-    constexpr const char* KeyName = "Name";
-
     constexpr openspace::properties::Property::PropertyInfo NameInfo = {
         "SpoutName",
         "Spout Sender Name",
@@ -54,30 +53,18 @@ namespace {
         "If this property is trigged, the 'SpoutSelection' options will be refreshed."
     };
 
+    struct [[codegen::Dictionary(ScreenSpaceSpout)]] Parameters {
+        // [[codegen::verbatim(NameInfo.description)]]
+        std::optional<std::string> spoutName;
+    };
+#include "screenspacespout_codegen.cpp"
+
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation ScreenSpaceSpout::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "ScreenSpace Spout",
-        "spout_screenspace_spout",
-        {
-            {
-                KeyName,
-                new StringVerifier,
-                Optional::Yes,
-                "Specifies the GUI name of the ScreenspaceSpout"
-            },
-            {
-                NameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                NameInfo.description
-            }
-        }
-    };
+    return codegen::doc<Parameters>("spout_screenspace_spout");
 }
 
 ScreenSpaceSpout::ScreenSpaceSpout(const ghoul::Dictionary& dictionary)
@@ -87,11 +74,7 @@ ScreenSpaceSpout::ScreenSpaceSpout(const ghoul::Dictionary& dictionary)
     , _updateSelection(UpdateInfo)
     , _receiver(GetSpout())
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "ScreenSpaceSpout"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     std::string identifier;
     if (dictionary.hasValue<std::string>(KeyIdentifier)) {
@@ -103,10 +86,7 @@ ScreenSpaceSpout::ScreenSpaceSpout(const ghoul::Dictionary& dictionary)
     identifier = makeUniqueIdentifier(identifier);
     setIdentifier(std::move(identifier));
 
-    if (dictionary.hasKey(NameInfo.identifier)) {
-        _spoutName = dictionary.value<std::string>(NameInfo.identifier);
-    }
-
+    _spoutName = p.spoutName.value_or(_spoutName);
     _spoutName.onChange([this]() {
         _isSpoutDirty = true;
         _isErrorMessageDisplayed = false;
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 80acc90ddb..18f2a34c7f 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -32,6 +32,7 @@
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
+#include <filesystem>
 #include <fstream>
 #include <numeric>
 
@@ -58,9 +59,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation HttpSynchronization::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "http_synchronization";
-    return doc;
+    return codegen::doc<Parameters>("http_synchronization");
 }
 
 HttpSynchronization::HttpSynchronization(const ghoul::Dictionary& dict,
@@ -85,17 +84,10 @@ HttpSynchronization::~HttpSynchronization() {
 }
 
 std::string HttpSynchronization::directory() {
-    ghoul::filesystem::Directory d(
-        _synchronizationRoot +
-        ghoul::filesystem::FileSystem::PathSeparator +
-        "http" +
-        ghoul::filesystem::FileSystem::PathSeparator +
-        _identifier +
-        ghoul::filesystem::FileSystem::PathSeparator +
-        std::to_string(_version)
+    std::string d = fmt::format(
+        "{}/http/{}/{}", _synchronizationRoot, _identifier, _version
     );
-
-    return FileSys.absPath(d);
+    return absPath(d).string();
 }
 
 void HttpSynchronization::start() {
@@ -157,7 +149,7 @@ void HttpSynchronization::createSyncFile() {
     const std::string& directoryName = directory();
     const std::string& filepath = directoryName + ".ossync";
 
-    FileSys.createDirectory(directoryName, ghoul::filesystem::FileSystem::Recursive::Yes);
+    std::filesystem::create_directories(directoryName);
 
     std::ofstream syncFile(filepath, std::ofstream::out);
     syncFile << "Synchronized";
@@ -166,7 +158,7 @@ void HttpSynchronization::createSyncFile() {
 
 bool HttpSynchronization::hasSyncFile() {
     const std::string& path = directory() + ".ossync";
-    return FileSys.fileExists(path);
+    return std::filesystem::is_regular_file(path);
 }
 
 bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
@@ -209,9 +201,9 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
         size_t lastSlash = line.find_last_of('/');
         std::string filename = line.substr(lastSlash + 1);
 
-        std::string fileDestination = directory() +
-            ghoul::filesystem::FileSystem::PathSeparator +
-            filename + TempSuffix;
+        std::string fileDestination = fmt::format(
+            "{}/{}{}", directory(), filename, TempSuffix
+        );
 
         if (sizeData.find(line) != sizeData.end()) {
             LWARNING(fmt::format("{}: Duplicate entries: {}", _identifier, line));
@@ -278,7 +270,9 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
                 tempName.size() - strlen(TempSuffix)
             );
 
-            FileSys.deleteFile(originalName);
+            if (std::filesystem::is_regular_file(originalName)) {
+                std::filesystem::remove(originalName);
+            }
             int success = rename(tempName.c_str(), originalName.c_str());
             if (success != 0) {
                 LERROR(fmt::format(
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index b1c75a80a6..d53d79ca49 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -34,6 +34,7 @@
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/dictionary.h>
+#include <filesystem>
 #include <fstream>
 #include <numeric>
 #include <memory>
@@ -77,9 +78,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation UrlSynchronization::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "sync_synchronization_url";
-    return doc;
+    return codegen::doc<Parameters>("sync_synchronization_url");
 }
 
 UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dict,
@@ -171,8 +170,9 @@ void UrlSynchronization::start() {
                 );
                 _filename = lastPartOfUrl;
             }
-            std::string fileDestination = directory() +
-                ghoul::filesystem::FileSystem::PathSeparator + _filename + TempSuffix;
+            std::string fileDestination = fmt::format(
+                "{}/{}{}", directory(), _filename, TempSuffix
+            );
 
             std::unique_ptr<AsyncHttpFileDownload> download =
                 std::make_unique<AsyncHttpFileDownload>(
@@ -233,7 +233,9 @@ void UrlSynchronization::start() {
                     tempName.size() - strlen(TempSuffix)
                 );
 
-                FileSys.deleteFile(originalName);
+                if (std::filesystem::is_regular_file(originalName)) {
+                    std::filesystem::remove(originalName);
+                }
                 int success = rename(tempName.c_str(), originalName.c_str());
                 if (success != 0) {
                     LERRORC(
@@ -288,7 +290,7 @@ bool UrlSynchronization::nTotalBytesIsKnown() {
 void UrlSynchronization::createSyncFile() {
     std::string dir = directory();
     std::string filepath = dir + ".ossync";
-    FileSys.createDirectory(dir, ghoul::filesystem::FileSystem::Recursive::Yes);
+    std::filesystem::create_directories(dir);
     std::ofstream syncFile(filepath, std::ofstream::out);
     syncFile << "Synchronized";
     syncFile.close();
@@ -296,18 +298,12 @@ void UrlSynchronization::createSyncFile() {
 
 bool UrlSynchronization::hasSyncFile() {
     const std::string& path = directory() + ".ossync";
-    return FileSys.fileExists(path);
+    return std::filesystem::is_regular_file(path);
 }
 
 std::string UrlSynchronization::directory() {
-    ghoul::filesystem::Directory d(
-        _synchronizationRoot + ghoul::filesystem::FileSystem::PathSeparator +
-        "url" + ghoul::filesystem::FileSystem::PathSeparator +
-        _identifier + ghoul::filesystem::FileSystem::PathSeparator +
-        "files"
-    );
-
-    return absPath(d);
+    std::string d = fmt::format("{}/url/{}/files", _synchronizationRoot, _identifier);
+    return absPath(d).string();
 }
 
 } // namespace openspace
diff --git a/modules/sync/tasks/syncassettask.cpp b/modules/sync/tasks/syncassettask.cpp
index b670301dff..04ba0573d2 100644
--- a/modules/sync/tasks/syncassettask.cpp
+++ b/modules/sync/tasks/syncassettask.cpp
@@ -37,43 +37,31 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/luastate.h>
 
-#include <string>
-#include <fstream>
 #include <chrono>
-
+#include <filesystem>
+#include <fstream>
+#include <string>
 #include <thread>
 
 namespace {
-    constexpr const char* KeyAsset = "Asset";
     constexpr std::chrono::milliseconds ProgressPollInterval(200);
+
+    struct [[codegen::Dictionary(SyncAssetTask)]] Parameters {
+        // The asset file to sync
+        std::filesystem::path asset;
+    };
+#include "syncassettask_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation SyncAssetTask::documentation() {
-    using namespace documentation;
-    return {
-        "SyncAssetTask",
-        "sync_asset_task",
-        {
-            {
-                KeyAsset,
-                new StringAnnotationVerifier("A file path to an asset"),
-                Optional::No,
-                "The asset file to sync"
-            }
-        }
-    };
+    return codegen::doc<Parameters>("sync_asset_task");
 }
 
 SyncAssetTask::SyncAssetTask(const ghoul::Dictionary& dictionary) {
-    documentation::testSpecificationAndThrow(
-        documentation(),
-        dictionary,
-        "SyncAssetTask"
-    );
-
-    _asset = dictionary.value<std::string>(KeyAsset);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _asset = p.asset.string();
 }
 
 std::string SyncAssetTask::description() {
diff --git a/modules/touch/shaders/marker_fs.glsl b/modules/touch/shaders/marker_fs.glsl
index 6b09a05a8e..26e79d594c 100644
--- a/modules/touch/shaders/marker_fs.glsl
+++ b/modules/touch/shaders/marker_fs.glsl
@@ -27,30 +27,28 @@
 
 in vec2 out_position;
 
-uniform float radius;
 uniform float opacity;
 uniform float thickness;
 uniform vec3 color;
 
-
 Fragment getFragment() {
-    // calculate normal from texture coordinates
-    vec3 n;
-    n.xy = gl_PointCoord.st * vec2(2.0, -2.0) + vec2(-1.0, 1.0);
-    float mag = dot(n.xy, n.xy);
-    if (mag > 1.0) {
-        // kill pixels outside circle
-        discard;
-    }
-    n.z = sqrt(1.0 - mag);
-    
-    // calculate lighting
-    vec3 light_dir = vec3(0.0, 0.0, 1.0);
-    float diffuse = max(0.0, dot(light_dir, n));
-    float alpha = min(pow(sqrt(mag), thickness), opacity);
+  // calculate normal from texture coordinates
+  vec3 n;
+  n.xy = gl_PointCoord.st * vec2(2.0, -2.0) + vec2(-1.0, 1.0);
+  float mag = dot(n.xy, n.xy);
+  if (mag > 1.0) {
+    // kill pixels outside circle
+    discard;
+  }
+  n.z = sqrt(1.0 - mag);
+  
+  // calculate lighting
+  vec3 light_dir = vec3(0.0, 0.0, 1.0);
+  float diffuse = max(0.0, dot(light_dir, n));
+  float alpha = min(pow(sqrt(mag), thickness), opacity);
 
-    Fragment frag;
-    frag.color = vec4(color * diffuse, alpha);
-    frag.depth = 1.0;
-    return frag;
+  Fragment frag;
+  frag.color = vec4(color * diffuse, alpha);
+  frag.depth = 1.0;
+  return frag;
 }
diff --git a/modules/touch/shaders/marker_vs.glsl b/modules/touch/shaders/marker_vs.glsl
index b57089428c..ea92dadaa3 100644
--- a/modules/touch/shaders/marker_vs.glsl
+++ b/modules/touch/shaders/marker_vs.glsl
@@ -30,10 +30,9 @@ out vec2 out_position;
 
 uniform float radius;
 
-
 void main() {
-    out_position = in_position;
+  out_position = in_position;
 
-    gl_PointSize = radius;
-    gl_Position = vec4(in_position, -1.0, 1.0);
+  gl_PointSize = radius;
+  gl_Position = vec4(in_position, -1.0, 1.0);
 }
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.cpp b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
index 6d992e848e..c9d15b3b1a 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.cpp
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
@@ -126,15 +126,15 @@ bool ToyVolumeRaycaster::isCameraInside(const RenderData& data, glm::vec3& local
 }
 
 std::string ToyVolumeRaycaster::boundsVertexShaderPath() const {
-    return absPath(GlslBoundsVsPath);
+    return absPath(GlslBoundsVsPath).string();
 }
 
 std::string ToyVolumeRaycaster::boundsFragmentShaderPath() const {
-    return absPath(GlslBoundsFsPath);
+    return absPath(GlslBoundsFsPath).string();
 }
 
 std::string ToyVolumeRaycaster::raycasterPath() const {
-    return absPath(GlslRaycastPath);
+    return absPath(GlslRaycastPath).string();
 }
 
 std::string ToyVolumeRaycaster::helperPath() const {
diff --git a/modules/vislab/include.cmake b/modules/vislab/include.cmake
new file mode 100644
index 0000000000..ffea0ac430
--- /dev/null
+++ b/modules/vislab/include.cmake
@@ -0,0 +1 @@
+set(DEFAULT_MODULE ON)
diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp
index 8d8adaa56e..693da653ad 100644
--- a/modules/vislab/rendering/renderabledistancelabel.cpp
+++ b/modules/vislab/rendering/renderabledistancelabel.cpp
@@ -74,9 +74,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation RenderableDistanceLabel::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "vislab_renderable_distance_label";
-    return doc;
+    return codegen::doc<Parameters>("vislab_renderable_distance_label");
 }
 
 RenderableDistanceLabel::RenderableDistanceLabel(const ghoul::Dictionary& dictionary)
diff --git a/modules/volume/rawvolumemetadata.cpp b/modules/volume/rawvolumemetadata.cpp
index 85c0a05bbd..61d525b6a8 100644
--- a/modules/volume/rawvolumemetadata.cpp
+++ b/modules/volume/rawvolumemetadata.cpp
@@ -143,9 +143,7 @@ ghoul::Dictionary RawVolumeMetadata::dictionary() {
 }
 
 documentation::Documentation RawVolumeMetadata::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "volume_rawvolumemetadata";
-    return doc;
+    return codegen::doc<Parameters>("volume_rawvolumemetadata");
 }
 
 } // namespace openspace::volume
diff --git a/modules/volume/rendering/basicvolumeraycaster.cpp b/modules/volume/rendering/basicvolumeraycaster.cpp
index ed547063ca..10366bbdf5 100644
--- a/modules/volume/rendering/basicvolumeraycaster.cpp
+++ b/modules/volume/rendering/basicvolumeraycaster.cpp
@@ -162,22 +162,21 @@ bool BasicVolumeRaycaster::isCameraInside(const RenderData& data,
 }
 
 std::string BasicVolumeRaycaster::boundsVertexShaderPath() const {
-    return absPath(GlslBoundsVsPath);
+    return absPath(GlslBoundsVsPath).string();
 }
 
 std::string BasicVolumeRaycaster::boundsFragmentShaderPath() const {
-    return absPath(GlslBoundsFsPath);
+    return absPath(GlslBoundsFsPath).string();
 }
 
 std::string BasicVolumeRaycaster::raycasterPath() const {
-    return absPath(GlslRaycastPath);
+    return absPath(GlslRaycastPath).string();
 }
 
 std::string BasicVolumeRaycaster::helperPath() const {
-    return absPath(GlslHelperPath);
+    return absPath(GlslHelperPath).string();
 }
 
-
 void BasicVolumeRaycaster::setTransferFunction(
                             std::shared_ptr<openspace::TransferFunction> transferFunction)
 {
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index fc32f26bc9..cd748315cb 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -44,21 +44,14 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/texture.h>
+#include <filesystem>
+#include <optional>
 
 namespace {
     constexpr const char* _loggerCat = "RenderableTimeVaryingVolume";
-} // namespace
-
-namespace {
 
     const char* KeyStepSize = "StepSize";
     const char* KeyGridType = "GridType";
-    const char* KeyTransferFunction = "TransferFunction";
-    const char* KeySourceDirectory = "SourceDirectory";
-
-    const char* KeyClipPlanes = "ClipPlanes";
-    const char* KeySecondsBefore = "SecondsBefore";
-    const char* KeySecondsAfter = "SecondsAfter";
 
     const float SecondsInOneDay = 60 * 60 * 24;
     constexpr const float VolumeMaxOpacity = 500;
@@ -129,44 +122,31 @@ namespace {
         "Radius upper bound",
         "" // @TODO Missing documentation
     };
+
+    struct [[codegen::Dictionary(RenderableTimeVaryingVolume)]] Parameters {
+        // Specifies the path to load timesteps from
+        std::string sourceDirectory;
+
+        // Specifies the transfer function file path
+        std::string transferFunction;
+
+        // Specifies the number of seconds to show the the first timestep before its
+        // actual time. The default value is 0
+        std::optional<float> secondsBefore;
+
+        // Specifies the number of seconds to show the the last timestep after its 
+        // actual time
+        float secondsAfter;
+
+        std::optional<ghoul::Dictionary> clipPlanes;
+    };
+#include "renderabletimevaryingvolume_codegen.cpp"
 } // namespace
 
 namespace openspace::volume {
 
-    documentation::Documentation RenderableTimeVaryingVolume::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableTimevaryingVolume",
-        "volume_renderable_timevaryingvolume",
-        {
-            {
-                KeySourceDirectory,
-                new StringVerifier,
-                Optional::No,
-                "Specifies the path to load timesteps from"
-            },
-            {
-                KeyTransferFunction,
-                new StringVerifier,
-                Optional::No,
-                "Specifies the transfer function file path"
-            },
-            {
-                KeySecondsBefore,
-                new DoubleVerifier,
-                Optional::Yes,
-                "Specifies the number of seconds to show the the first timestep before "
-                "its actual time. The default value is 0."
-            },
-            {
-                KeySecondsAfter,
-                new DoubleVerifier,
-                Optional::No,
-                "Specifies the number of seconds to show the the last timestep after its "
-                "actual time"
-            }
-        }
-    };
+documentation::Documentation RenderableTimeVaryingVolume::Documentation() {
+    return codegen::doc<Parameters>("volume_renderable_timevaryingvolume");
 }
 
 RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
@@ -184,14 +164,10 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
     , _jumpToTimestep(JumpToTimestepInfo, 0, 0, 256)
     , _currentTimestep(CurrentTimeStepInfo, 0, 0, 256)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableTimeVaryingVolume"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _sourceDirectory = absPath(dictionary.value<std::string>(KeySourceDirectory));
-    _transferFunctionPath = absPath(dictionary.value<std::string>(KeyTransferFunction));
+    _sourceDirectory = absPath(p.sourceDirectory).string();
+    _transferFunctionPath = absPath(p.transferFunction).string();
     _transferFunction = std::make_shared<openspace::TransferFunction>(
         _transferFunctionPath,
         [](const openspace::TransferFunction&) {}
@@ -207,15 +183,10 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
         _stepSize = static_cast<float>(dictionary.value<double>(KeyStepSize));
     }
 
-    if (dictionary.hasValue<double>(KeySecondsBefore)) {
-        _secondsBefore = static_cast<float>(dictionary.value<double>(KeySecondsBefore));
-    }
-    _secondsAfter = static_cast<float>(dictionary.value<double>(KeySecondsAfter));
+    _secondsBefore = p.secondsBefore.value_or(_secondsBefore);
+    _secondsAfter = p.secondsAfter;
 
-    ghoul::Dictionary clipPlanesDictionary;
-    if (dictionary.hasValue<ghoul::Dictionary>(KeyClipPlanes)) {
-        clipPlanesDictionary.value<ghoul::Dictionary>(KeyClipPlanes);
-    }
+    ghoul::Dictionary clipPlanesDictionary = p.clipPlanes.value_or(ghoul::Dictionary());
     _clipPlanes = std::make_shared<volume::VolumeClipPlanes>(clipPlanesDictionary);
     _clipPlanes->setIdentifier("clipPlanes");
     _clipPlanes->setGuiName("Clip Planes");
@@ -233,32 +204,26 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
 RenderableTimeVaryingVolume::~RenderableTimeVaryingVolume() {}
 
 void RenderableTimeVaryingVolume::initializeGL() {
-    using RawPath = ghoul::filesystem::Directory::RawPath;
-    ghoul::filesystem::Directory sequenceDir(_sourceDirectory, RawPath::Yes);
+    std::filesystem::path sequenceDir = absPath(_sourceDirectory);
 
-    if (!FileSys.directoryExists(sequenceDir)) {
-        LERROR(fmt::format("Could not load sequence directory '{}'", sequenceDir.path()));
+    if (!std::filesystem::is_directory(sequenceDir)) {
+        LERROR(fmt::format("Could not load sequence directory {}", sequenceDir));
         return;
     }
 
-    using Recursive = ghoul::filesystem::Directory::Recursive;
-    using Sort = ghoul::filesystem::Directory::Sort;
-
-    std::vector<std::string> sequencePaths = sequenceDir.read(Recursive::Yes, Sort::No);
-    for (const std::string& path : sequencePaths) {
-        ghoul::filesystem::File currentFile(path);
-        std::string extension = currentFile.fileExtension();
-        if (extension == "dictionary") {
-            loadTimestepMetadata(path);
+    namespace fs = std::filesystem;
+    for (const fs::directory_entry& e : fs::recursive_directory_iterator(sequenceDir)) {
+        if (e.is_regular_file() && e.path().extension() == ".dictionary") {
+            loadTimestepMetadata(e.path().string());
         }
     }
 
     // TODO: defer loading of data to later (separate thread or at least not when loading)
     for (std::pair<const double, Timestep>& p : _volumeTimesteps) {
         Timestep& t = p.second;
-        std::string path = FileSys.pathByAppendingComponent(
-            _sourceDirectory, t.baseName
-        ) + ".rawvolume";
+        std::string path = fmt::format(
+            "{}/{}.rawvolume", _sourceDirectory.value(), t.baseName
+        );
         RawVolumeReader<float> reader(path, t.metadata.dimensions);
         t.rawVolume = reader.read();
 
@@ -358,7 +323,7 @@ void RenderableTimeVaryingVolume::loadTimestepMetadata(const std::string& path)
 
     Timestep t;
     t.metadata = metadata;
-    t.baseName = ghoul::filesystem::File(path).baseName();
+    t.baseName = std::filesystem::path(path).stem().string();
     t.inRam = false;
     t.onGpu = false;
 
diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp
index 53372f91f8..109703d6f6 100644
--- a/modules/volume/tasks/generaterawvolumetask.cpp
+++ b/modules/volume/tasks/generaterawvolumetask.cpp
@@ -38,6 +38,7 @@
 #include <ghoul/lua/lua_helper.h>
 #include <ghoul/misc/dictionaryluaformatter.h>
 #include <ghoul/misc/defer.h>
+#include <filesystem>
 #include <fstream>
 
 namespace {
@@ -71,9 +72,7 @@ namespace {
 namespace openspace::volume {
 
 documentation::Documentation GenerateRawVolumeTask::documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "generate_raw_volume_task";
-    return doc;
+    return codegen::doc<Parameters>("generate_raw_volume_task");
 }
 
 GenerateRawVolumeTask::GenerateRawVolumeTask(const ghoul::Dictionary& dictionary) {
@@ -104,8 +103,9 @@ std::string GenerateRawVolumeTask::description() {
 void GenerateRawVolumeTask::perform(const Task::ProgressCallback& progressCallback) {
     // Spice kernel is required for time conversions.
     // Todo: Make this dependency less hard coded.
-    SpiceManager::KernelHandle kernel =
-        SpiceManager::ref().loadKernel(absPath("${DATA}/assets/spice/naif0012.tls"));
+    SpiceManager::KernelHandle kernel = SpiceManager::ref().loadKernel(
+        absPath("${DATA}/assets/spice/naif0012.tls").string()
+    );
 
     defer {
         SpiceManager::ref().unloadKernel(kernel);
@@ -164,13 +164,12 @@ void GenerateRawVolumeTask::perform(const Task::ProgressCallback& progressCallba
 
     luaL_unref(state, LUA_REGISTRYINDEX, functionReference);
 
-    ghoul::filesystem::File file(_rawVolumeOutputPath);
-    const std::string directory = file.directoryName();
-    if (!FileSys.directoryExists(directory)) {
-        FileSys.createDirectory(directory, ghoul::filesystem::FileSystem::Recursive::Yes);
+    const std::filesystem::path directory = _rawVolumeOutputPath.parent_path();
+    if (!std::filesystem::is_directory(directory)) {
+        std::filesystem::create_directories(directory);
     }
 
-    volume::RawVolumeWriter<float> writer(_rawVolumeOutputPath);
+    volume::RawVolumeWriter<float> writer(_rawVolumeOutputPath.string());
     writer.write(rawVolume);
 
     progressCallback(0.9f);
diff --git a/modules/volume/tasks/generaterawvolumetask.h b/modules/volume/tasks/generaterawvolumetask.h
index 367a590ce3..9f7448b76c 100644
--- a/modules/volume/tasks/generaterawvolumetask.h
+++ b/modules/volume/tasks/generaterawvolumetask.h
@@ -28,6 +28,7 @@
 #include <openspace/util/task.h>
 
 #include <ghoul/glm.h>
+#include <filesystem>
 #include <string>
 
 namespace openspace::volume {
@@ -40,8 +41,8 @@ public:
     static documentation::Documentation documentation();
 
 private:
-    std::string _rawVolumeOutputPath;
-    std::string  _dictionaryOutputPath;
+    std::filesystem::path _rawVolumeOutputPath;
+    std::filesystem::path  _dictionaryOutputPath;
     std::string _time;
 
     glm::uvec3 _dimensions = glm::uvec3(0);
diff --git a/modules/volume/transferfunction.cpp b/modules/volume/transferfunction.cpp
index 0539ec516c..4ed2bc7e4f 100644
--- a/modules/volume/transferfunction.cpp
+++ b/modules/volume/transferfunction.cpp
@@ -90,7 +90,7 @@ bool TransferFunction::setEnvelopesFromLua(lua_State* state) {
     return success;
 }
 
-bool TransferFunction::envelopesToLua(lua_State* state) {
+void TransferFunction::envelopesToLua(lua_State* state) const {
     lua_newtable(state);
     for (auto iter = _envelopes.begin(); iter != _envelopes.end(); ++iter) {
         lua_newtable(state);
@@ -101,7 +101,6 @@ bool TransferFunction::envelopesToLua(lua_State* state) {
             ("[\"" + std::to_string(iter - _envelopes.begin() + 1) + "\"]").c_str()
         );
     }
-    return true;
 }
 
 void TransferFunction::loadEnvelopesFromFile(const std::string& path) {
diff --git a/modules/volume/transferfunction.h b/modules/volume/transferfunction.h
index 0d574d9e4d..a356d14893 100644
--- a/modules/volume/transferfunction.h
+++ b/modules/volume/transferfunction.h
@@ -38,7 +38,7 @@ public:
     TransferFunction() = default;
     TransferFunction(const std::string& string);
 
-    bool envelopesToLua(lua_State* state);
+    void envelopesToLua(lua_State* state) const;
 
     bool setEnvelopesFromString(const std::string& s);
     bool setEnvelopesFromLua(lua_State* lua);
diff --git a/modules/volume/transferfunctionproperty.cpp b/modules/volume/transferfunctionproperty.cpp
index 83d8a3ff97..16d1a400c3 100644
--- a/modules/volume/transferfunctionproperty.cpp
+++ b/modules/volume/transferfunctionproperty.cpp
@@ -23,38 +23,37 @@
  ****************************************************************************************/
 
 #include <modules/volume/transferfunctionproperty.h>
-
 #include <ghoul/lua/ghoul_lua.h>
 
-namespace {
+namespace openspace::properties {
 
-openspace::volume::TransferFunction fromLuaConversion(lua_State* state, bool& success) {
+TransferFunctionProperty::TransferFunctionProperty(Property::PropertyInfo info,
+                                                   volume::TransferFunction value)
+    : TemplateProperty<volume::TransferFunction>(std::move(info), value)
+{}
+
+std::string TransferFunctionProperty::className() const {
+    return "TransferFunctionProperty";
+}
+
+int TransferFunctionProperty::typeLua() const {
+    return LUA_TTABLE;
+}
+
+openspace::volume::TransferFunction
+TransferFunctionProperty::fromLuaConversion(lua_State* state, bool& success) const
+{
     openspace::volume::TransferFunction tf;
     success = tf.setEnvelopesFromLua(state);
     return tf;
 }
 
-bool toLuaConversion(lua_State* state, openspace::volume::TransferFunction value) {
-    return value.envelopesToLua(state);
+void TransferFunctionProperty::toLuaConversion(lua_State* state) const {
+    _value.envelopesToLua(state);
 }
 
-bool toStringConversion(std::string& outValue,
-                        openspace::volume::TransferFunction inValue)
-{
-    outValue = inValue.serializedToString();
-    return true;
+std::string TransferFunctionProperty::toStringConversion() const {
+    return _value.serializedToString();
 }
 
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_TEMPLATEPROPERTY_SOURCE(TransferFunctionProperty, volume::TransferFunction,
-    volume::TransferFunction(),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
 } // namespace openspace::properties
diff --git a/modules/volume/transferfunctionproperty.h b/modules/volume/transferfunctionproperty.h
index 85eaab4a89..ca0a690ea5 100644
--- a/modules/volume/transferfunctionproperty.h
+++ b/modules/volume/transferfunctionproperty.h
@@ -30,7 +30,22 @@
 
 namespace openspace::properties {
 
-REGISTER_TEMPLATEPROPERTY_HEADER(TransferFunctionProperty, volume::TransferFunction)
+class TransferFunctionProperty : public TemplateProperty<volume::TransferFunction> {
+public:
+    TransferFunctionProperty(Property::PropertyInfo info,
+        volume::TransferFunction value = volume::TransferFunction());
+
+    std::string className() const override;
+    int typeLua() const override;
+
+    using TemplateProperty<volume::TransferFunction>::operator=;
+
+protected:
+    volume::TransferFunction fromLuaConversion(lua_State* state,
+        bool& success) const override;
+    void toLuaConversion(lua_State* state) const override;
+    std::string toStringConversion() const override;
+};
 
 } // namespace openspace::properties
 
diff --git a/modules/webbrowser/include/browserclient.h b/modules/webbrowser/include/browserclient.h
index 7cc98ef6c5..f884a110bc 100644
--- a/modules/webbrowser/include/browserclient.h
+++ b/modules/webbrowser/include/browserclient.h
@@ -43,7 +43,6 @@ class WebKeyboardHandler;
 
 class BrowserClient : public CefClient {
 public:
-
     class NoContextMenuHandler : public CefContextMenuHandler {
         bool RunContextMenu(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
             CefRefPtr<CefContextMenuParams> params, CefRefPtr<CefMenuModel> model,
diff --git a/modules/webbrowser/include/browserinstance.h b/modules/webbrowser/include/browserinstance.h
index 8ff3349fcf..f0a99f3a34 100644
--- a/modules/webbrowser/include/browserinstance.h
+++ b/modules/webbrowser/include/browserinstance.h
@@ -62,6 +62,7 @@ public:
     ~BrowserInstance();
 
     void loadUrl(std::string url);
+
     /**
      * Load a local file.
      *
@@ -79,14 +80,14 @@ public:
     void reshape(const glm::ivec2& windowSize);
 
     /**
-     * encapsulate renderHandler's draw method
+     * Encapsulate renderHandler's draw method
      */
     void draw();
     void close(bool force = false);
 
 #ifdef WIN32
     void sendTouchEvent(const CefTouchEvent& event) const;
-#endif
+#endif // WIN32
 
     bool sendKeyEvent(const CefKeyEvent& event);
     bool sendMouseClickEvent(const CefMouseEvent& event,
@@ -96,7 +97,7 @@ public:
     bool sendMouseMoveEvent(const CefMouseEvent& event);
 
     /**
-     * send scroll wheel event to browser
+     * Send scroll wheel event to browser
      *
      * \param event Key event with position
      * \param delta The scroll amount in pixels
@@ -104,10 +105,7 @@ public:
      */
     bool sendMouseWheelEvent(const CefMouseEvent& event, const glm::ivec2& delta);
 
-    /**
-     * Set the browser zoom level.
-     * 1.0 = default, 2.0 = double, etc.
-     */
+    /// Set the browser zoom level. 1.0 = default, 2.0 = double, etc.
     void setZoom(float ratio);
 
     void reloadBrowser();
@@ -116,7 +114,7 @@ public:
 
     const CefRefPtr<CefBrowser>& getBrowser() const;
 
-    bool hasContent(int x, int y);
+    bool hasContent(const glm::ivec2& pos) const;
 
     bool _shouldReshape = false;
 
diff --git a/modules/webbrowser/include/eventhandler.h b/modules/webbrowser/include/eventhandler.h
index 36758e0627..1ef3f35fa6 100644
--- a/modules/webbrowser/include/eventhandler.h
+++ b/modules/webbrowser/include/eventhandler.h
@@ -79,19 +79,16 @@ private:
 
     /**
      * Create a mouse event on the current cursor position.
-     *
-     * \return
      */
     CefMouseEvent mouseEvent(KeyModifier mods = KeyModifier::NoModifier);
 
 #ifdef WIN32
     /**
-     * Build a CEF touch event based on our internal structure
+     * Build a CEF touch event based on our internal structure.
      *
-     * Note: as of 02/21/2020 we are using an older version of CEF on OSX
-     * than WIN32.
-     * This version does not handle the CefTouchEvent type and does
-     * not have any internal touch handling.
+     * Note: As of 2020-02-21 we are using an older version of CEF on OSX than WIN32. This
+     * version does not handle the CefTouchEvent type and does not have any internal
+     * touch handling
      */
     CefTouchEvent touchEvent(const TouchInput& input,
         const cef_touch_event_type_t eventType) const;
@@ -117,12 +114,11 @@ private:
     MouseButtonState _leftButton;
     MouseButtonState _rightButton;
 
-    //This vector assumes first element to be the active one:
+    // This vector assumes first element to be the active one:
     std::vector<TouchInput> _validTouchStates;
 
     /**
-     * determines if a click should be sent as a double click or not
-     * @return
+     * Determines if a click should be sent as a double click or not
      */
     bool isDoubleClick(const MouseButtonState& button) const;
 };
diff --git a/modules/webbrowser/src/browserclient.cpp b/modules/webbrowser/src/browserclient.cpp
index b8c550128c..1250f06adb 100644
--- a/modules/webbrowser/src/browserclient.cpp
+++ b/modules/webbrowser/src/browserclient.cpp
@@ -65,11 +65,10 @@ CefRefPtr<CefKeyboardHandler> BrowserClient::GetKeyboardHandler() {
     return _keyboardHandler;
 }
 
-bool BrowserClient::NoContextMenuHandler::RunContextMenu(
-                                                     CefRefPtr<CefBrowser>,
-                                                     CefRefPtr<CefFrame>,
-                                                     CefRefPtr<CefContextMenuParams>,
-                                                     CefRefPtr<CefMenuModel>,
+bool BrowserClient::NoContextMenuHandler::RunContextMenu(CefRefPtr<CefBrowser>,
+                                                         CefRefPtr<CefFrame>,
+                                                         CefRefPtr<CefContextMenuParams>,
+                                                         CefRefPtr<CefMenuModel>,
                                                      CefRefPtr<CefRunContextMenuCallback>)
 {
     // Disable the context menu.
diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp
index 2a4b6d6492..66f8dae363 100644
--- a/modules/webbrowser/src/browserinstance.cpp
+++ b/modules/webbrowser/src/browserinstance.cpp
@@ -35,6 +35,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/profiling.h>
+#include <filesystem>
 
 namespace {
     constexpr const char* _loggerCat = "CEF BrowserInstance";
@@ -96,12 +97,12 @@ void BrowserInstance::loadUrl(std::string url) {
 }
 
 bool BrowserInstance::loadLocalPath(std::string path) {
-    if (!FileSys.fileExists(path)) {
-        LDEBUG(fmt::format("Could not find path `{}`, verify that it is correct.", path));
+    if (!std::filesystem::is_regular_file(path)) {
+        LDEBUG(fmt::format("Could not find path '{}', verify that it is correct", path));
         return false;
     }
 
-    loadUrl(absPath(std::move(path)));
+    loadUrl(absPath(std::move(path)).string());
     return true;
 }
 
@@ -142,18 +143,17 @@ bool BrowserInstance::sendKeyEvent(const CefKeyEvent& event) {
 
 bool BrowserInstance::sendMouseClickEvent(const CefMouseEvent& event,
                                           CefBrowserHost::MouseButtonType button,
-                                          bool mouseUp,
-                                          int clickCount)
+                                          bool mouseUp, int clickCount)
 {
     _browser->GetHost()->SendMouseClickEvent(event, button, mouseUp, clickCount);
-    return hasContent(event.x, event.y);
+    return hasContent(glm::ivec2(event.x, event.y));
 }
 
 #ifdef WIN32
 void BrowserInstance::sendTouchEvent(const CefTouchEvent& event) const{
     _browser->GetHost()->SendTouchEvent(event);
 }
-#endif
+#endif // WIN32
 
 bool BrowserInstance::sendMouseMoveEvent(const CefMouseEvent& event) {
     constexpr const bool DidNotLeaveWindow = false;
@@ -166,7 +166,7 @@ bool BrowserInstance::sendMouseWheelEvent(const CefMouseEvent& event,
                                           const glm::ivec2& delta)
 {
     _browser->GetHost()->SendMouseWheelEvent(event, delta.x, delta.y);
-    return hasContent(event.x, event.y);
+    return hasContent(glm::ivec2(event.x, event.y));
 }
 
 void BrowserInstance::setZoom(float ratio) {
@@ -174,7 +174,7 @@ void BrowserInstance::setZoom(float ratio) {
 
     // Zooming in CEF is non-linear according to this:
     // https://www.magpcss.org/ceforum/viewtopic.php?f=6&t=11491
-    _zoomLevel = glm::log(static_cast<double>(ratio * dpiScaling))/glm::log(1.2);
+    _zoomLevel = glm::log(ratio * dpiScaling) / glm::log(1.2);
     _browser->GetHost()->SetZoomLevel(_zoomLevel);
 }
 
@@ -188,8 +188,8 @@ void BrowserInstance::selectAll() {
     }
 }
 
-bool BrowserInstance::hasContent(int x, int y) {
-    return _renderHandler->hasContent(x, y);
+bool BrowserInstance::hasContent(const glm::ivec2& pos) const {
+    return _renderHandler->hasContent(pos.x, pos.y);
 }
 
 } // namespace openspace
diff --git a/modules/webbrowser/src/cefhost.cpp b/modules/webbrowser/src/cefhost.cpp
index 49bbf51c99..0465400715 100644
--- a/modules/webbrowser/src/cefhost.cpp
+++ b/modules/webbrowser/src/cefhost.cpp
@@ -32,7 +32,7 @@
 
 #ifdef __APPLE__
 #include <include/wrapper/cef_library_loader.h>
-#endif
+#endif // __APPLE__
 
 namespace {
     constexpr const char* _loggerCat = "CefHost";
@@ -40,41 +40,38 @@ namespace {
 
 namespace openspace {
 
-CefHost::CefHost(const std::string& helperLocation) {
+CefHost::CefHost([[maybe_unused]] const std::string& helperLocation) {
     LDEBUG("Initializing CEF...");
 
     CefSettings settings;
 
 #ifndef __APPLE__
-    // Apple will always look for helper in a fixed location.
+    // Apple will always look for helper in a fixed location
     CefString(&settings.browser_subprocess_path).FromString(helperLocation);
-#else
-    // Silence a warning about unused variable
-    (void)helperLocation;
-#endif
+#endif // __APPLE__
 
     settings.windowless_rendering_enabled = true;
     attachDebugSettings(settings);
 
 #ifdef WIN32
-    // Enable High-DPI support on Windows 7 or newer.
+    // Enable High-DPI support on Windows 7 or newer
     CefEnableHighDPISupport();
-#endif
+#endif // WIN32
 
 #ifdef __APPLE__
-    // Load the CEF framework library at runtime instead of linking directly
-    // as required by the macOS sandbox implementation.
+    // Load the CEF framework library at runtime instead of linking directly as required
+    // by the macOS sandbox implementation
     CefScopedLibraryLoader library_loader;
     if (!library_loader.LoadInMain()) {
         return;
     }
-#endif
+#endif // __APPLE__
 
     CefRefPtr<WebBrowserApp> app(new WebBrowserApp);
 
     CefMainArgs args;
     CefInitialize(args, settings, app.get(), nullptr);
-    LDEBUG("Initializing CEF... done!");
+    LDEBUG("Initializing CEF... done");
 }
 
 CefHost::~CefHost() {
diff --git a/modules/webbrowser/src/defaultbrowserlauncher.cpp b/modules/webbrowser/src/defaultbrowserlauncher.cpp
index 39e6b591df..027eb8edf9 100644
--- a/modules/webbrowser/src/defaultbrowserlauncher.cpp
+++ b/modules/webbrowser/src/defaultbrowserlauncher.cpp
@@ -28,30 +28,24 @@
 
 #ifdef WIN32
 #include <shellapi.h>
-#endif
-
-namespace {
-
-void launchBrowser(const std::string& url) {
-    LDEBUGC("DefaultBrowserLauncher", "Launching default browser: " + url);
-#ifdef WIN32
-    ShellExecuteA(nullptr, nullptr, url.c_str(), nullptr, nullptr, SW_SHOW);
-#endif
-}
-
-} // namespace
+#endif // WIN32
 
 namespace openspace {
 
 bool DefaultBrowserLauncher::OnBeforePopup(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>,
-                                           const CefString& targetUrl, const CefString&,
+                                           [[ maybe_unused ]] const CefString& targetUrl,
+                                           const CefString&,
                                            CefLifeSpanHandler::WindowOpenDisposition,
                                            bool, const CefPopupFeatures&, CefWindowInfo&,
                                            CefRefPtr<CefClient>&, CefBrowserSettings&,
                                            bool*)
 {
     // never permit CEF popups, always launch in default browser
-    launchBrowser(targetUrl.ToString());
+#ifdef WIN32
+    std::string url = targetUrl.ToString();
+    LDEBUGC("DefaultBrowserLauncher", "Launching default browser: " + url);
+    ShellExecuteA(nullptr, nullptr, url.c_str(), nullptr, nullptr, SW_SHOW);
+#endif
     return true;
 }
 
diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp
index 33a5fe9166..a3eb3695a8 100644
--- a/modules/webbrowser/src/eventhandler.cpp
+++ b/modules/webbrowser/src/eventhandler.cpp
@@ -58,10 +58,9 @@ namespace {
         }
     }
 
-    // Map from GLFW key codes to native key codes for Mac.
-    // The keys inserted here are based from setting breakpoints in
-    // the CEF-bundled 'cefclient' (browser_window_osr_mac.mm)
-    // as well as trial and error.
+    // Map from GLFW key codes to native key codes for Mac. The keys inserted here are
+    // based from setting breakpoints in the CEF-bundled 'cefclient'
+    // (browser_window_osr_mac.mm) as well as trial and error.
     // There is an issue for proper cross-platform key events in CEF:
     // https://bitbucket.org/chromiumembedded/cef/issues/1750
     // For now, the 'important' keys are inserted here manually.
@@ -122,9 +121,8 @@ namespace {
     }
 
     /**
-     * get the number of milliseconds that is allowed between two clicks for it to count
+     * Get the number of milliseconds that is allowed between two clicks for it to count
      * as a double click
-     * @return
      */
     int doubleClickTime() {
 #ifdef WIN32
@@ -135,9 +133,8 @@ namespace {
     }
 
     /**
-     * get the rectangle width around the first click in a double click that the second
+     * Get the rectangle width around the first click in a double click that the second
      * click has to be _within_
-     * @return
      */
     int maxDoubleClickDistance() {
 #ifdef WIN32
@@ -187,8 +184,7 @@ void EventHandler::initialize() {
     global::callback::mouseScrollWheel->emplace_back(
         [this](double x, double y) -> bool {
             if (_browserInstance) {
-                const glm::ivec2 delta(x, y);
-                return mouseWheelCallback(delta);
+                return mouseWheelCallback(glm::ivec2(x, y));
             }
             return false;
         }
@@ -201,10 +197,7 @@ void EventHandler::initialize() {
             }
 
             const glm::vec2 windowPos = input.currentWindowCoordinates();
-            const bool hasContent = _browserInstance->hasContent(
-                static_cast<int>(windowPos.x),
-                static_cast<int>(windowPos.y)
-            );
+            const bool hasContent = _browserInstance->hasContent(windowPos);
             if (!hasContent) {
                 return false;
             }
@@ -238,10 +231,7 @@ void EventHandler::initialize() {
 
     global::callback::touchUpdated->emplace_back(
         [&](TouchInput input) -> bool {
-            if (!_browserInstance) {
-                return false;
-            }
-            if (_validTouchStates.empty()) {
+            if (!_browserInstance || _validTouchStates.empty()) {
                 return false;
             }
 
@@ -250,28 +240,27 @@ void EventHandler::initialize() {
                 _validTouchStates.cend(),
                 [&](const TouchInput& state){
                     return state.fingerId == input.fingerId &&
-                    state.touchDeviceId == input.touchDeviceId;
+                           state.touchDeviceId == input.touchDeviceId;
                 }
             );
 
             if (it == _validTouchStates.cbegin()) {
 #ifdef WIN32
-
                 CefTouchEvent event = touchEvent(
                     input,
                     cef_touch_event_type_t::CEF_TET_MOVED
                 );
                 _browserInstance->sendTouchEvent(event);
-#else
+#else // ^^^^ WIN32 // !WIN32 vvvv
                 glm::vec2 windowPos = input.currentWindowCoordinates();
                 _mousePosition.x = windowPos.x;
                 _mousePosition.y = windowPos.y;
                 _leftButton.down = true;
                 _browserInstance->sendMouseMoveEvent(mouseEvent());
-#endif
+#endif // WIN32
                 return true;
             }
-            else if (it != _validTouchStates.cend()){
+            else if (it != _validTouchStates.cend()) {
                 return true;
             }
             return false;
@@ -305,7 +294,7 @@ void EventHandler::initialize() {
                 cef_touch_event_type_t::CEF_TET_RELEASED
             );
             _browserInstance->sendTouchEvent(event);
-#endif
+#endif // WIN32
             _validTouchStates.erase(found);
 #ifndef WIN32
             if (_validTouchStates.empty()) {
@@ -320,7 +309,7 @@ void EventHandler::initialize() {
                     BrowserInstance::SingleClick
                 );
             }
-#endif
+#endif // WIN32
         }
     );
 }
@@ -362,11 +351,8 @@ bool EventHandler::mouseButtonCallback(MouseButton button, MouseAction action,
 }
 
 bool EventHandler::isDoubleClick(const MouseButtonState& button) const {
-    // check time
-    using namespace std::chrono;
-
-    auto now = high_resolution_clock::now();
-    milliseconds maxTimeDifference(doubleClickTime());
+    auto now = std::chrono::high_resolution_clock::now();
+    std::chrono::milliseconds maxTimeDifference(doubleClickTime());
     auto requiredTime = button.lastClickTime + maxTimeDifference;
     if (requiredTime < now) {
         return false;
@@ -419,11 +405,11 @@ bool EventHandler::keyboardCallback(Key key, KeyModifier modifier, KeyAction act
     CefKeyEvent keyEvent;
 
     // TODO(klas): Use something less platform specific?
-    keyEvent.windows_key_code     = mapFromGlfwToWindows(key);
-    keyEvent.native_key_code      = mapFromGlfwToNative(key);
+    keyEvent.windows_key_code = mapFromGlfwToWindows(key);
+    keyEvent.native_key_code = mapFromGlfwToNative(key);
     keyEvent.unmodified_character = mapFromGlfwToUnmodifiedCharacter(key);
-    keyEvent.modifiers            = mapToCefModifiers(modifier);
-    keyEvent.type                 = keyEventType(action);
+    keyEvent.modifiers = mapToCefModifiers(modifier);
+    keyEvent.type = keyEventType(action);
 
     return _browserInstance->sendKeyEvent(keyEvent);
 }
@@ -467,7 +453,7 @@ CefMouseEvent EventHandler::mouseEvent(KeyModifier mods) {
 
 #ifdef WIN32
 CefTouchEvent EventHandler::touchEvent(const TouchInput& input,
-    const cef_touch_event_type_t eventType) const
+                                       const cef_touch_event_type_t eventType) const
 {
     const glm::vec2 windowPos = input.currentWindowCoordinates();
     CefTouchEvent event = {};
@@ -475,19 +461,19 @@ CefTouchEvent EventHandler::touchEvent(const TouchInput& input,
     event.x = windowPos.x;
     event.y = windowPos.y;
     event.type = eventType;
-    const std::vector<std::pair<Key, KeyModifier>>& keyModVec =
+    const std::vector<std::pair<Key, KeyModifier>>& keyMods =
         global::navigationHandler->inputState().pressedKeys();
-    for (const std::pair<Key, KeyModifier>& keyModPair : keyModVec) {
-        const KeyModifier mods = keyModPair.second;
+    for (const std::pair<Key, KeyModifier>& p : keyMods) {
+        const KeyModifier mods = p.second;
         event.modifiers |= static_cast<uint32_t>(mapToCefModifiers(mods));
     }
     event.pointer_type = cef_pointer_type_t::CEF_POINTER_TYPE_TOUCH;
     return event;
 }
-#endif
+#endif // WIN32
 
 void EventHandler::setBrowserInstance(BrowserInstance* browserInstance) {
-    LDEBUG("Setting browser instance.");
+    LDEBUG("Setting browser instance");
     _browserInstance = browserInstance;
 }
 
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index a2c4df95fe..b4e3a87765 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -27,11 +27,13 @@
 #include <modules/webbrowser/webbrowsermodule.h>
 #include <modules/webbrowser/include/webkeyboardhandler.h>
 #include <modules/webbrowser/include/browserinstance.h>
+#include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/engine/windowdelegate.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/texture.h>
+#include <optional>
 
 namespace {
     constexpr const char* _loggerCat = "ScreenSpaceBrowser";
@@ -41,6 +43,7 @@ namespace {
         "Browser Dimensions",
         "Set the dimensions of the web browser windows."
     };
+
     const openspace::properties::Property::PropertyInfo UrlInfo = {
         "Url",
         "URL",
@@ -53,6 +56,12 @@ namespace {
         "Reload the web browser"
     };
 
+    struct [[codegen::Dictionary(ScreenSpaceBrowser)]] Parameters {
+        std::optional<std::string> identifier;
+        std::optional<std::string> url;
+    };
+#include "screenspacebrowser_codegen.cpp"
+
 } // namespace
 
 namespace openspace {
@@ -65,31 +74,24 @@ void ScreenSpaceBrowser::ScreenSpaceRenderHandler::setTexture(GLuint t) {
     _texture = t;
 }
 
-ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary &dictionary)
+ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary& dictionary)
     : ScreenSpaceRenderable(dictionary)
     , _url(UrlInfo)
     , _dimensions(DimensionsInfo, glm::vec2(0.f), glm::vec2(0.f), glm::vec2(3000.f))
     , _reload(ReloadInfo)
 {
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    std::string identifier;
-    if (dictionary.hasValue<std::string>(KeyIdentifier)) {
-        identifier = dictionary.value<std::string>(KeyIdentifier);
-    }
-    else {
-        identifier = "ScreenSpaceBrowser";
-    }
+    std::string identifier = p.identifier.value_or("ScreenSpaceBrowser");
     identifier = makeUniqueIdentifier(identifier);
     setIdentifier(identifier);
 
-    if (dictionary.hasValue<std::string>(UrlInfo.identifier)) {
-        _url = dictionary.value<std::string>(UrlInfo.identifier);
-    }
+    _url = p.url.value_or(_url);
 
     glm::vec2 windowDimensions = global::windowDelegate->currentSubwindowSize();
     _dimensions = windowDimensions;
 
-    _renderHandler = new ScreenSpaceRenderHandler();
+    _renderHandler = new ScreenSpaceRenderHandler;
     _keyboardHandler = new WebKeyboardHandler();
     _browserInstance = std::make_unique<BrowserInstance>(
         _renderHandler,
@@ -112,7 +114,7 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary &dictionary)
 
 bool ScreenSpaceBrowser::initializeGL() {
     _texture = std::make_unique<ghoul::opengl::Texture>(
-         glm::uvec3(_dimensions.value(), 1.0f)
+         glm::uvec3(_dimensions.value(), 1.f)
     );
 
     _renderHandler->setTexture(*_texture);
@@ -128,9 +130,7 @@ bool ScreenSpaceBrowser::deinitializeGL() {
     _renderHandler->setTexture(0);
     _texture = nullptr;
 
-    std::string urlString;
-    _url.getStringValue(urlString);
-    LDEBUG(fmt::format("Deinitializing ScreenSpaceBrowser: {}", urlString));
+    LDEBUG(fmt::format("Deinitializing ScreenSpaceBrowser: {}", _url.value()));
 
     _browserInstance->close(true);
 
@@ -150,6 +150,7 @@ void ScreenSpaceBrowser::render() {
     if (!_renderHandler->isTextureReady()) {
         return;
     }
+
     _renderHandler->updateTexture();
     draw(
         globalRotationMatrix() *
diff --git a/modules/webbrowser/src/webbrowserapp.cpp b/modules/webbrowser/src/webbrowserapp.cpp
index 6ba297f9cc..2e9d085d92 100644
--- a/modules/webbrowser/src/webbrowserapp.cpp
+++ b/modules/webbrowser/src/webbrowserapp.cpp
@@ -23,7 +23,6 @@
  ****************************************************************************************/
 
 #include "include/webbrowserapp.h"
-//#include <modules/webbrowser/include/webbrowserapp.h>
 
 namespace openspace {
 
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index 5f20bffa7a..3b68498d42 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -37,6 +37,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
+#include <filesystem>
 
 namespace {
     constexpr const char* _loggerCat = "WebBrowser";
@@ -115,15 +116,14 @@ void WebBrowserModule::internalDeinitialize() {
     }
 }
 
-std::string WebBrowserModule::findHelperExecutable() {
-    std::string execLocation = absPath("${BIN}/" + std::string(SubprocessPath));
-    if (!FileSys.fileExists(execLocation)) {
+std::filesystem::path WebBrowserModule::findHelperExecutable() {
+    std::filesystem::path execLocation = absPath("${BIN}/" + std::string(SubprocessPath));
+    if (!std::filesystem::is_regular_file(execLocation)) {
         LERROR(fmt::format(
             "Could not find web helper executable at location: {}" , execLocation
         ));
     }
     return execLocation;
-
 }
 
 void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) {
@@ -141,13 +141,12 @@ void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) {
     }
 
     const bool isMaster = global::windowDelegate->isMaster();
-
-    if (!_enabled || (!isMaster) ) {
+    if (!_enabled || (!isMaster)) {
         return;
     }
 
-    LDEBUG("CEF using web helper executable: " + _webHelperLocation);
-    _cefHost = std::make_unique<CefHost>(_webHelperLocation);
+    LDEBUG(fmt::format("CEF using web helper executable: {}", _webHelperLocation));
+    _cefHost = std::make_unique<CefHost>(_webHelperLocation.string());
     LDEBUG("Starting CEF... done!");
 
     if (dictionary.hasValue<bool>(UpdateBrowserBetweenRenderablesInfo.identifier)) {
@@ -189,7 +188,7 @@ void WebBrowserModule::removeBrowser(BrowserInstance* browser) {
         _browsers.erase(p);
     }
     else {
-        LWARNING("Could not find browser in list of browsers.");
+        LWARNING("Could not find browser in list of browsers");
     }
 
     if (_browsers.empty()) {
@@ -215,17 +214,14 @@ bool WebBrowserModule::isEnabled() const {
     return _enabled;
 }
 
-/**
- * Logic for the webbrowser performance hotfix,
- * described in more detail in globalscallbacks.h.
- */
+/// Logic for the webbrowser performance hotfix, described in globalscallbacks.h
 namespace webbrowser {
 
- /**
-* The time interval to describe how often the CEF message loop needs to
-* be pumped to work properly. A value of 10000 us updates CEF a 100 times
-* per second which is enough for fluid interaction without wasting resources
-*/
+/**
+ * The time interval to describe how often the CEF message loop needs to be pumped to work
+ * properly. A value of 10000 us updates CEF a 100 times per second which is enough for
+ * fluid interaction without wasting resources
+ */
 std::chrono::microseconds interval = std::chrono::microseconds(10000);
 std::chrono::time_point<std::chrono::high_resolution_clock> latestCall;
 CefHost* cefHost = nullptr;
@@ -246,7 +242,7 @@ void update() {
         latestCall = timeAfter;
     }
 }
-}
+
+} // namespace webbrowser
 
 } // namespace openspace
-
diff --git a/modules/webbrowser/webbrowsermodule.h b/modules/webbrowser/webbrowsermodule.h
index adc3379bb3..19c66fd418 100644
--- a/modules/webbrowser/webbrowsermodule.h
+++ b/modules/webbrowser/webbrowsermodule.h
@@ -29,6 +29,7 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <chrono>
+#include <filesystem>
 
 namespace openspace {
 
@@ -41,11 +42,12 @@ namespace webbrowser {
     extern std::chrono::time_point<std::chrono::high_resolution_clock> latestCall;
     extern CefHost* cefHost;
     void update();
-}
+} // namespace webbrowser
 
 class WebBrowserModule : public OpenSpaceModule {
 public:
     static constexpr const char* Name = "WebBrowser";
+
     WebBrowserModule();
     virtual ~WebBrowserModule() = default;
 
@@ -67,7 +69,7 @@ private:
      *
      * \return the absolute path to the file
      */
-    std::string findHelperExecutable();
+    std::filesystem::path findHelperExecutable();
 
     properties::BoolProperty _updateBrowserBetweenRenderables;
     properties::FloatProperty _browserUpdateInterval;
@@ -75,7 +77,7 @@ private:
     std::vector<BrowserInstance*> _browsers;
     std::unique_ptr<EventHandler> _eventHandler;
     std::unique_ptr<CefHost> _cefHost;
-    std::string _webHelperLocation;
+    std::filesystem::path _webHelperLocation;
     bool _enabled = true;
 };
 
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index 774e8b675d..edd45b9846 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -25,17 +25,23 @@
 #include <modules/webgui/webguimodule.h>
 
 #include <modules/server/servermodule.h>
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
-#include <openspace/documentation/documentationgenerator.h>
+#include <openspace/util/json_helper.h>
 #include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
+#include <filesystem>
+#include <optional>
 
 namespace {
     constexpr const char* _loggerCat = "WebGuiModule";
+    constexpr const char* DefaultAddress = "localhost";
+    constexpr const int DefaultPort = 4680;
 
     constexpr openspace::properties::Property::PropertyInfo ServerProcessEnabledInfo = {
         "ServerProcessEnabled",
@@ -68,9 +74,7 @@ namespace {
         "The node js command to invoke."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo
-        DirectoriesInfo =
-    {
+    constexpr openspace::properties::Property::PropertyInfo DirectoriesInfo = {
         "Directories",
         "Directories",
         "Directories from which to to serve static content, as a string list "
@@ -78,9 +82,7 @@ namespace {
         "even is the directory.",
     };
 
-    constexpr openspace::properties::Property::PropertyInfo
-        DefaultEndpointInfo =
-    {
+    constexpr openspace::properties::Property::PropertyInfo DefaultEndpointInfo = {
         "DefaultEndpoint",
         "Default Endpoint",
         "The 'default' endpoint. "
@@ -88,9 +90,7 @@ namespace {
     };
 
 
-    constexpr openspace::properties::Property::PropertyInfo
-        ServedDirectoriesInfo =
-    {
+    constexpr openspace::properties::Property::PropertyInfo ServedDirectoriesInfo = {
         "ServedDirectories",
         "ServedDirectories",
         "Directories that are currently served. This value is set by the server process, "
@@ -99,9 +99,18 @@ namespace {
         "Manual changes to this property have no effect."
     };
 
-    constexpr const char* DefaultAddress = "localhost";
-    constexpr const int DefaultPort = 4680;
-}
+    struct [[codegen::Dictionary(WebGuiModule)]] Parameters {
+        // [[codegen::verbatim(PortInfo.description)]]
+        std::optional<int> port;
+
+        // [[codegen::verbatim(AddressInfo.description)]]
+        std::optional<std::string> address;
+
+        // [[codegen::verbatim(WebSocketInterfaceInfo.description)]]
+        std::optional<std::string> webSocketInterface;
+    };
+#include "webguimodule_codegen.cpp"
+} // namespace
 
 namespace openspace {
 
@@ -114,7 +123,7 @@ WebGuiModule::WebGuiModule()
     , _defaultEndpoint(DefaultEndpointInfo)
     , _port(PortInfo, DefaultPort)
     , _address(AddressInfo, DefaultAddress)
-    , _webSocketInterface(WebSocketInterfaceInfo, "")
+    , _webSocketInterface(WebSocketInterfaceInfo)
 {
     addProperty(_enabled);
     addProperty(_entryPoint);
@@ -142,34 +151,23 @@ WebGuiModule::CallbackHandle WebGuiModule::addEndpointChangeCallback(EndpointCal
 
 void WebGuiModule::removeEndpointChangeCallback(CallbackHandle handle) {
     const auto it = std::find_if(
-        _endpointChangeCallbacks.begin(),
-        _endpointChangeCallbacks.end(),
+        _endpointChangeCallbacks.cbegin(),
+        _endpointChangeCallbacks.cend(),
         [handle](const std::pair<CallbackHandle, EndpointCallback>& cb) {
             return cb.first == handle;
         }
     );
 
-    ghoul_assert(
-        it != _endpointChangeCallbacks.end(),
-        "handle must be a valid callback handle"
-    );
-
+    ghoul_assert(it != _endpointChangeCallbacks.cend(), "Must be valid callback handle");
     _endpointChangeCallbacks.erase(it);
 }
 
 void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
-    if (configuration.hasValue<int>(PortInfo.identifier)) {
-        _port = configuration.value<int>(PortInfo.identifier);
-    }
+    const Parameters p = codegen::bake<Parameters>(configuration);
 
-    if (configuration.hasValue<std::string>(AddressInfo.identifier)) {
-        _address = configuration.value<std::string>(AddressInfo.identifier);
-    }
-
-    if (configuration.hasValue<std::string>(WebSocketInterfaceInfo.identifier)) {
-        _webSocketInterface =
-            configuration.value<std::string>(WebSocketInterfaceInfo.identifier);
-    }
+    _port = p.port.value_or(_port);
+    _address = p.address.value_or(_address);
+    _webSocketInterface = p.webSocketInterface.value_or(_webSocketInterface);
 
     auto startOrStop = [this]() {
         if (_enabled && !_entryPoint.value().empty()) {
@@ -193,7 +191,7 @@ void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
     _defaultEndpoint.onChange(restartIfEnabled);
     _servedDirectories.onChange([this]() {
         std::unordered_map<std::string, std::string> newEndpoints;
-        std::vector<std::string> list = _servedDirectories.value();
+        std::vector<std::string> list = _servedDirectories;
         if (!list.empty()) {
             for (size_t i = 0; i < list.size() - 1; i += 2) {
                 newEndpoints[list[i]] = newEndpoints[list[i + 1]];
@@ -234,28 +232,28 @@ void WebGuiModule::startProcess() {
     _endpoints.clear();
 
     ServerModule* serverModule = global::moduleEngine->module<ServerModule>();
-    const ServerInterface* serverInterface =
-        serverModule->serverInterfaceByIdentifier(_webSocketInterface);
+    const ServerInterface* serverInterface = serverModule->serverInterfaceByIdentifier(
+        _webSocketInterface
+    );
     if (!serverInterface) {
-        LERROR("Missing server interface. Server process could not start.");
+        LERROR("Missing server interface. Server process could not start");
         return;
     }
     const int webSocketPort = serverInterface->port();
 
-
 #ifdef _MSC_VER
-    const std::string nodePath = absPath("${MODULE_WEBGUI}/ext/nodejs/node.exe");
+    const std::filesystem::path node = absPath("${MODULE_WEBGUI}/ext/nodejs/node.exe");
 #else
-    const std::string nodePath = absPath("${MODULE_WEBGUI}/ext/nodejs/node");
+    const std::filesystem::path node = absPath("${MODULE_WEBGUI}/ext/nodejs/node");
 #endif
 
     std::string formattedDirectories = "[";
 
-    std::vector<std::string> directories = _directories.value();
+    std::vector<std::string> directories = _directories;
     for (size_t i = 0; i < directories.size(); ++i) {
         std::string arg = directories[i];
-        if (i & 1) {
-            arg = absPath(arg);
+        if (i % 2 == 1) {
+            arg = absPath(arg).string();
         }
         formattedDirectories += "\\\"" + escapedJson(escapedJson(arg)) + "\\\"";
         if (i != directories.size() - 1) {
@@ -264,22 +262,21 @@ void WebGuiModule::startProcess() {
     }
     formattedDirectories += "]";
 
-    const std::string defaultEndpoint = _defaultEndpoint.value().empty() ?
-        "" :
-        " --redirect \"" + _defaultEndpoint.value() + "\"";
+    std::string defaultEndpoint;
+    if (!_defaultEndpoint.value().empty()) {
+        defaultEndpoint = fmt::format("--redirect \"{}\"", _defaultEndpoint.value());
+    }
 
-    const std::string command = "\"" + nodePath + "\" "
-        + "\"" + absPath(_entryPoint.value()) + "\"" +
-        " --directories \"" + formattedDirectories + "\"" +
-        defaultEndpoint +
-        " --http-port \"" + std::to_string(_port.value()) + "\" " +
-        " --ws-address \"" + _address.value() + "\"" +
-        " --ws-port " + std::to_string(webSocketPort) +
-        " --auto-close --local";
+    const std::string command = fmt::format(
+        "\"{}\" \"{}\" --directories \"{}\" {} --http-port \"{}\" --ws-address \"{}\" "
+        "--ws-port {} --auto-close --local",
+        node.string(), absPath(_entryPoint.value()).string(), formattedDirectories,
+        defaultEndpoint, _port.value(), _address.value(), webSocketPort
+    );
 
     _process = std::make_unique<ghoul::Process>(
         command,
-        absPath("${BIN}"),
+        absPath("${BIN}").string(),
         [](const char* data, size_t n) {
             const std::string str(data, n);
             LDEBUG(fmt::format("Web GUI server output: {}", str));
@@ -292,7 +289,7 @@ void WebGuiModule::startProcess() {
 }
 
 void WebGuiModule::stopProcess() {
-    for (const auto& e : _endpoints) {
+    for (const std::pair<const std::string, std::string>& e : _endpoints) {
         notifyEndpointListeners(e.first, false);
     }
     _endpoints.clear();
diff --git a/modules/webgui/webguimodule.h b/modules/webgui/webguimodule.h
index a7fbc0fff6..08cc047552 100644
--- a/modules/webgui/webguimodule.h
+++ b/modules/webgui/webguimodule.h
@@ -33,8 +33,8 @@
 #include <openspace/properties/scalar/intproperty.h>
 #include <ghoul/misc/process.h>
 #include <memory>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace openspace {
 
diff --git a/openspace.cfg b/openspace.cfg
index 7f18243690..140c040ff3 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -219,7 +219,7 @@ ScreenshotUseDate = true
 BypassLauncher = false
 
 -- OnScreenTextScaling = "framebuffer"
--- PerSceneCache = true
+-- PerProfileCache = true
 -- DisableRenderingOnMaster = true
 -- DisableInGameConsole = true
 
@@ -234,6 +234,8 @@ OpenGLDebugContext = {
         { Type = "Other", Source = "API", Identifier = 131185 },
         -- API_ID_RECOMPILE_FRAGMENT_SHADER performance warning has been generated. Fragment shader recompiled due to state change
         { Type = "Performance", Source = "API", Identifier = 2 },
+        -- Pixel-path performance warning: Pixel transfer is synchronized with 3D rendering
+        { Type = "Performance", Source = "API", Identifier = 131154 },
         -- Buffer performance warning: "copied/moved from VIDEO memory to HOST memory"
         { Type = "Performance", Source = "API", Identifier = 131186 },
         -- API_ID_LINE_WIDTH deprecated behavior warning has been generated
diff --git a/scripts/configuration_helper.lua b/scripts/configuration_helper.lua
index 84dd547e75..deb3b94651 100644
--- a/scripts/configuration_helper.lua
+++ b/scripts/configuration_helper.lua
@@ -797,6 +797,7 @@ function sgct.config.fisheye(arg)
         arg["background"] = { r = 0.0, g = 0.0, b = 0.0, a = 1.0 }
     end
 
+    local trackedSpecifier = ""
     if (arg["tracked"] ~= nil and arg["tracked"] == true) then
         trackedSpecifier = "tracked=\"true\""
     else
diff --git a/shaders/framebuffer/fxaa.frag b/shaders/framebuffer/fxaa.frag
index 2a86d8b9ea..425f319987 100644
--- a/shaders/framebuffer/fxaa.frag
+++ b/shaders/framebuffer/fxaa.frag
@@ -34,12 +34,13 @@ const float[12] QUALITY = float[](1.f, 1.f, 1.f, 1.f, 1.f, 1.5f, 2.f, 2.f, 2.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;
 layout (location = 0) out vec4 aaFinalColor;
 
 uniform vec2 inverseScreenSize;
 uniform sampler2D renderedTexture;
-
-in vec2 texCoord;
+uniform vec4 Viewport;
+uniform vec2 Resolution;
 
 // Relative luminance
 float getLum(vec3 rgb){
@@ -47,17 +48,28 @@ float getLum(vec3 rgb){
 }
 
 void main() {
-    vec4 colorCenter = texture(renderedTexture,texCoord);
+    // Modify the texCoord based on the Viewport and Resolution. This modification is
+    // necessary in case of side-by-side stereo as we only want to access the part of the
+    // feeding texture that we are currently responsible for.  Otherwise we would map the
+    // entire feeding texture into our half of the result texture, leading to a doubling
+    // of the "missing" half.  If you don't believe me, load a configuration file with the
+    // side_by_side stereo mode enabled, disable FXAA, and remove this modification
+    // The same calculation is done in the HDR resolving shader
+    vec2 st = texCoord;
+    st.x = st.x / (Resolution.x / Viewport[2]) + (Viewport[0] / Resolution.x);
+    st.y = st.y / (Resolution.y / Viewport[3]) + (Viewport[1] / Resolution.y);
+
+    vec4 colorCenter = texture(renderedTexture, st);
 
     // ============================
     // Detecting where to apply AA:
     // ============================
 
     float pixelLumCenter = getLum(colorCenter.rgb);
-    float pixelLumDown   = getLum(textureOffset(renderedTexture, texCoord, ivec2(0,-1)).rgb);
-    float pixelLumUp     = getLum(textureOffset(renderedTexture, texCoord, ivec2(0,1)).rgb);
-    float pixelLumLeft   = getLum(textureOffset(renderedTexture, texCoord, ivec2(-1,0)).rgb);
-    float pixelLumRight  = getLum(textureOffset(renderedTexture, texCoord, ivec2(1,0)).rgb);
+    float pixelLumDown   = getLum(textureOffset(renderedTexture, st, ivec2(0,-1)).rgb);
+    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)));
@@ -75,10 +87,10 @@ void main() {
     // ============================
     // Estimating the gradient:
     // ============================
-    float pixelLumDownLeft  = getLum(textureOffset(renderedTexture, texCoord, ivec2(-1,-1)).rgb);
-    float pixelLumUpRight   = getLum(textureOffset(renderedTexture, texCoord, ivec2(1,1)).rgb);
-    float pixelLumUpLeft    = getLum(textureOffset(renderedTexture, texCoord, ivec2(-1,1)).rgb);
-    float pixelLumDownRight = getLum(textureOffset(renderedTexture, texCoord, ivec2(1,-1)).rgb);
+    float pixelLumDownLeft  = getLum(textureOffset(renderedTexture, st, ivec2(-1,-1)).rgb);
+    float pixelLumUpRight   = getLum(textureOffset(renderedTexture, st, ivec2(1,1)).rgb);
+    float pixelLumUpLeft    = getLum(textureOffset(renderedTexture, st, ivec2(-1,1)).rgb);
+    float pixelLumDownRight = getLum(textureOffset(renderedTexture, st, ivec2(1,-1)).rgb);
 
     float pixelLumDownUp       = pixelLumDown + pixelLumUp;
     float pixelLumLeftRight    = pixelLumLeft + pixelLumRight;
@@ -119,7 +131,7 @@ void main() {
         pixelLumLocalAverage = 0.5 * (pixelLum2 + pixelLumCenter);
     }
 
-    vec2 currentUv = texCoord;
+    vec2 currentUv = st;
     if (isHorizontal) {
         currentUv.y += stepLength * 0.5;
     } else {
@@ -189,8 +201,8 @@ void main() {
     // ============================
     // Estimating the offset:
     // ============================
-    float distance1 = isHorizontal ? (texCoord.x - uv1.x) : (texCoord.y - uv1.y);
-    float distance2 = isHorizontal ? (uv2.x - texCoord.x) : (uv2.y - texCoord.y);
+    float distance1 = isHorizontal ? (st.x - uv1.x) : (st.y - uv1.y);
+    float distance2 = isHorizontal ? (uv2.x - st.x) : (uv2.y - st.y);
 
     bool isDirection1 = distance1 < distance2;
     float distanceFinal = min(distance1, distance2);
@@ -222,7 +234,7 @@ void main() {
     // Biggest of the two offsets.
     finalOffset = max(finalOffset, subPixelOffsetFinal);
 
-    vec2 finalUV = texCoord;
+    vec2 finalUV = st;
     if (isHorizontal) {
         finalUV.y += finalOffset * stepLength;
     } else {
diff --git a/shaders/framebuffer/hdrAndFiltering.frag b/shaders/framebuffer/hdrAndFiltering.frag
index 5c501b4eaa..cc80c55fe9 100644
--- a/shaders/framebuffer/hdrAndFiltering.frag
+++ b/shaders/framebuffer/hdrAndFiltering.frag
@@ -29,6 +29,7 @@
 #define HSV_COLOR 0u
 #define HSL_COLOR 1u
 
+in vec2 texCoord;
 layout (location = 0) out vec4 finalColor;
 
 uniform float hdrExposure;
@@ -38,13 +39,24 @@ uniform float Hue;
 uniform float Saturation;
 uniform float Value;
 uniform float Lightness;
+uniform vec4 Viewport;
+uniform vec2 Resolution;
 
 uniform sampler2D hdrFeedingTexture;
 
-in vec2 texCoord;
-
 void main() {
-    vec4 color = texture(hdrFeedingTexture, texCoord);
+    // Modify the texCoord based on the Viewport and Resolution. This modification is
+    // necessary in case of side-by-side stereo as we only want to access the part of the
+    // feeding texture that we are currently responsible for.  Otherwise we would map the
+    // entire feeding texture into our half of the result texture, leading to a doubling
+    // of the "missing" half.  If you don't believe me, load a configuration file with the
+    // side_by_side stereo mode enabled, disable FXAA, and remove this modification.
+    // The same calculation is done in the FXAA shader
+    vec2 st = texCoord;
+    st.x = st.x / (Resolution.x / Viewport[2]) + (Viewport[0] / Resolution.x);
+    st.y = st.y / (Resolution.y / Viewport[3]) + (Viewport[1] / Resolution.y);
+
+    vec4 color = texture(hdrFeedingTexture, st);
     color.rgb *= blackoutFactor;
     
     // Applies TMO
diff --git a/shaders/framebuffer/mergeDownscaledVolume.frag b/shaders/framebuffer/mergeDownscaledVolume.frag
index 034ea8c5b9..f331461ff6 100644
--- a/shaders/framebuffer/mergeDownscaledVolume.frag
+++ b/shaders/framebuffer/mergeDownscaledVolume.frag
@@ -24,14 +24,26 @@
 
 #version __CONTEXT__
 
+in vec2 texCoord;
 layout (location = 0) out vec4 finalColor;
 
 uniform sampler2D downscaledRenderedVolume;
 uniform sampler2D downscaledRenderedVolumeDepth;
-
-in vec2 texCoord;
+uniform vec4 viewport;
+uniform vec2 resolution;
 
 void main() {
-    finalColor   = texture(downscaledRenderedVolume, texCoord);
-    gl_FragDepth = texture(downscaledRenderedVolumeDepth, texCoord).r;
+    // Modify the texCoord based on the Viewport and Resolution. This modification is
+    // necessary in case of side-by-side stereo as we only want to access the part of the
+    // feeding texture that we are currently responsible for.  Otherwise we would map the
+    // entire feeding texture into our half of the result texture, leading to a doubling
+    // of the "missing" half.  If you don't believe me, load a configuration file with the
+    // side_by_side stereo mode enabled, disable FXAA, and remove this modification
+    // The same calculation is done in the HDR resolving shader
+    vec2 st = texCoord;
+    st.x = st.x / (resolution.x / viewport[2]) + (viewport[0] / resolution.x);
+    st.y = st.y / (resolution.y / viewport[3]) + (viewport[1] / resolution.y);
+
+  finalColor = texture(downscaledRenderedVolume, st);
+  gl_FragDepth = texture(downscaledRenderedVolumeDepth, st).r;
 }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7eebd7de61..23d6ff8de2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -81,42 +81,20 @@ set(OPENSPACE_SOURCE
   ${OPENSPACE_BASE_DIR}/src/properties/list/intlistproperty.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/list/stringlistproperty.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat2property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat2x3property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat2x4property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat3x2property.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat3property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat3x4property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat4x2property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat4x3property.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat4property.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat2property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat2x3property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat2x4property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat3x2property.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat3property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat3x4property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat4x2property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat4x3property.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat4property.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/scalar/boolproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/charproperty.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/scalar/doubleproperty.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/scalar/floatproperty.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/scalar/intproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/longdoubleproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/longlongproperty.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/scalar/longproperty.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/scalar/shortproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/signedcharproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/ucharproperty.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/scalar/uintproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/ulonglongproperty.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/scalar/ulongproperty.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/scalar/ushortproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/wcharproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/bvec2property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/bvec3property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/bvec4property.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec2property.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec3property.cpp
   ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec4property.cpp
@@ -178,6 +156,7 @@ set(OPENSPACE_SOURCE
   ${OPENSPACE_BASE_DIR}/src/util/distanceconversion.cpp
   ${OPENSPACE_BASE_DIR}/src/util/factorymanager.cpp
   ${OPENSPACE_BASE_DIR}/src/util/httprequest.cpp
+  ${OPENSPACE_BASE_DIR}/src/util/json_helper.cpp
   ${OPENSPACE_BASE_DIR}/src/util/keys.cpp
   ${OPENSPACE_BASE_DIR}/src/util/openspacemodule.cpp
   ${OPENSPACE_BASE_DIR}/src/util/planegeometry.cpp
@@ -268,8 +247,6 @@ set(OPENSPACE_HEADER
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/numericalproperty.inl
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/optionproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/propertydelegate.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/propertydelegate.inl
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/propertyowner.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/selectionproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/stringproperty.h
@@ -280,42 +257,20 @@ set(OPENSPACE_HEADER
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/list/intlistproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/list/stringlistproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat2property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat2x3property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat2x4property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat3x2property.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat3property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat3x4property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat4x2property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat4x3property.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat4property.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat2property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat2x3property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat2x4property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat3x2property.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat3property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat3x4property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat4x2property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat4x3property.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat4property.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/boolproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/charproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/doubleproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/floatproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/intproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/longdoubleproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/longlongproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/longproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/shortproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/signedcharproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ucharproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/uintproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ulonglongproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ulongproperty.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ushortproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/wcharproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/bvec2property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/bvec3property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/bvec4property.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec2property.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec3property.h
   ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec4property.h
@@ -382,6 +337,8 @@ set(OPENSPACE_HEADER
   ${OPENSPACE_BASE_DIR}/include/openspace/util/factorymanager.inl
   ${OPENSPACE_BASE_DIR}/include/openspace/util/httprequest.h
   ${OPENSPACE_BASE_DIR}/include/openspace/util/job.h
+  ${OPENSPACE_BASE_DIR}/include/openspace/util/json_helper.h
+  ${OPENSPACE_BASE_DIR}/include/openspace/util/json_helper.inl
   ${OPENSPACE_BASE_DIR}/include/openspace/util/keys.h
   ${OPENSPACE_BASE_DIR}/include/openspace/util/memorymanager.h
   ${OPENSPACE_BASE_DIR}/include/openspace/util/mouse.h
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 35edf1a73e..e5c1a61ce4 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -27,6 +27,7 @@
 #include <openspace/openspace.h>
 #include <openspace/documentation/core_registration.h>
 #include <openspace/documentation/verifier.h>
+#include <openspace/util/json_helper.h>
 #include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/profiling.h>
@@ -48,7 +49,7 @@ DocumentationEngine* DocumentationEngine::_instance = nullptr;
 DocumentationEngine::DuplicateDocumentationException::DuplicateDocumentationException(
                                                                         Documentation doc)
     : ghoul::RuntimeError(fmt::format(
-        "Duplicate Documentation with name '{}' and id '{}'",doc.name, doc.id
+        "Duplicate Documentation with name '{}' and id '{}'", doc.name, doc.id
     ))
     , documentation(std::move(doc))
 {}
diff --git a/src/documentation/documentationgenerator.cpp b/src/documentation/documentationgenerator.cpp
index 8f7880a576..91963c2a01 100644
--- a/src/documentation/documentationgenerator.cpp
+++ b/src/documentation/documentationgenerator.cpp
@@ -58,66 +58,4 @@ std::string DocumentationGenerator::jsonName() {
     return _jsonName;
 }
 
-std::string escapedJson(const std::vector<std::string>& list) {
-    std::string jsonString;
-    jsonString += "[";
-    for (const std::string& text : list) {
-        jsonString += "\\\"";
-        for (const char& c : text) {
-            switch (c) {
-            case '\t':
-                jsonString += "\\t"; // Replace tab with \t.
-                break;
-            case '"':
-                jsonString += "\\\""; // Replace " with \".
-                break;
-            case '\\':
-                jsonString += "\\\\"; // Replace \ with \\.
-                break;
-            case '\n':
-                jsonString += "\\\\n"; // Replace newline with \n.
-                break;
-            case '\r':
-                jsonString += "\\r"; // Replace carriage return with \r.
-                break;
-            default:
-                jsonString += c;
-            }
-        }
-        jsonString += "\\\",";
-    }
-    if (jsonString.length() > 1) {
-        jsonString.pop_back();
-    }
-    jsonString += "]";
-
-    return jsonString;
-}
-
-std::string escapedJson(const std::string& text) {
-    std::string jsonString;
-    for (const char& c : text) {
-        switch (c) {
-        case '\t':
-            jsonString += "\\t"; // Replace tab with \t.
-            break;
-        case '"':
-            jsonString += "\\\""; // Replace " with \".
-            break;
-        case '\\':
-            jsonString += "\\\\"; // Replace \ with \\.
-            break;
-        case '\n':
-            jsonString += "\\\\n"; // Replace newline with \n.
-            break;
-        case '\r':
-            jsonString += "\\r"; // Replace carriage return with \r.
-            break;
-        default:
-            jsonString += c;
-        }
-    }
-    return jsonString;
-}
-
 } // namespace openspace
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index a4a9c20d9b..22ffdec0a6 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -733,18 +733,18 @@ TestResult AndVerifier::operator()(const ghoul::Dictionary& dictionary,
     );
 
     if (success) {
-        TestResult res;
-        res.success = true;
-        return res;
+        TestResult r;
+        r.success = true;
+        return r;
     }
     else {
-        TestResult res;
-        res.success = false;
+        TestResult r;
+        r.success = false;
         TestResult::Offense o;
         o.offender = key;
         o.reason = TestResult::Offense::Reason::Verification;
-        res.offenses.push_back(o);
-        return res;
+        r.offenses.push_back(o);
+        return r;
     }
 }
 
@@ -810,18 +810,18 @@ TestResult OrVerifier::operator()(const ghoul::Dictionary& dictionary,
     );
 
     if (success) {
-        TestResult res;
-        res.success = true;
-        return res;
+        TestResult r;
+        r.success = true;
+        return r;
     }
     else {
-        TestResult res;
-        res.success = false;
+        TestResult r;
+        r.success = false;
         TestResult::Offense o;
         o.offender = key;
         o.reason = TestResult::Offense::Reason::Verification;
-        res.offenses.push_back(o);
-        return res;
+        r.offenses.push_back(o);
+        return r;
     }
 }
 
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index f063bded20..f61dbc9ef7 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -129,11 +129,11 @@ namespace {
         // shutting down. If ESC is pressed again in this time, the shutdown is aborted
         std::optional<float> shutdownCountdown [[codegen::greater(0.0)]];
 
-        // If this is set to 'true', the name of the scene will be appended to the cache
+        // If this is set to 'true', the name of the profile will be appended to the cache
         // directory, thus not reusing the same directory. This is useful in cases where
-        // the same instance of OpenSpace is run with multiple scenes, but the caches
+        // the same instance of OpenSpace is run with multiple profiles, but the caches
         // should be retained. This value defaults to 'false'
-        std::optional<bool> perSceneCache;
+        std::optional<bool> perProfileCache;
 
         enum class Scaling {
             Window [[codegen::key("window")]],
@@ -348,7 +348,7 @@ void parseLuaState(Configuration& configuration) {
 
     // We go through all of the entries and lift them from global scope into the table on
     // the stack so that we can create a ghoul::Dictionary from this new table
-    documentation::Documentation doc = codegen::doc<Parameters>();
+    documentation::Documentation doc = codegen::doc<Parameters>("core_configuration");
     for (const documentation::DocumentationEntry& e : doc.entries) {
         lua_pushstring(s, e.key.c_str());
         lua_getglobal(s, e.key.c_str());
@@ -388,7 +388,7 @@ void parseLuaState(Configuration& configuration) {
                 throw ghoul::MissingCaseException();
         }
     }
-    c.usePerSceneCache = p.perSceneCache.value_or(c.usePerSceneCache);
+    c.usePerProfileCache = p.perProfileCache.value_or(c.usePerProfileCache);
     c.isRenderingOnMasterDisabled =
         p.disableRenderingOnMaster.value_or(c.isRenderingOnMasterDisabled);
     c.globalRotation = p.globalRotation.value_or(c.globalRotation);
@@ -603,33 +603,26 @@ void parseLuaState(Configuration& configuration) {
     c.bypassLauncher = p.bypassLauncher.value_or(c.bypassLauncher);
 }
 
-documentation::Documentation Configuration::Documentation = codegen::doc<Parameters>();
+documentation::Documentation Configuration::Documentation =
+    codegen::doc<Parameters>("core_configuration");
 
-std::string findConfiguration(const std::string& filename) {
-    using ghoul::filesystem::Directory;
-
-    Directory directory = FileSys.absolutePath("${BIN}");
+std::filesystem::path findConfiguration(const std::string& filename) {
+    std::filesystem::path directory = absPath("${BIN}");
 
     while (true) {
-        std::string fullPath = FileSys.pathByAppendingComponent(
-            directory,
-            filename
-        );
-
-        if (FileSys.fileExists(fullPath)) {
+        std::filesystem::path p = directory / filename;
+        if (std::filesystem::exists(p) && std::filesystem::is_regular_file(p)) {
             // We have found the configuration file and can bail out
-            return fullPath;
+            return p;
         }
 
         // Otherwise, we traverse the directory tree up
-        Directory nextDirectory = directory.parentDirectory(
-            ghoul::filesystem::Directory::AbsolutePath::Yes
-        );
+        std::filesystem::path nextDirectory = directory.parent_path();
 
-        if (directory.path() == nextDirectory.path()) {
+        if (directory == nextDirectory) {
             // We have reached the root of the file system and did not find the file
             throw ghoul::RuntimeError(
-                "Could not find configuration file '" + filename + "'",
+                fmt::format("Could not find configuration file '{}'", filename),
                 "ConfigurationManager"
             );
         }
@@ -637,21 +630,20 @@ std::string findConfiguration(const std::string& filename) {
     }
 }
 
-Configuration loadConfigurationFromFile(const std::string& filename,
+Configuration loadConfigurationFromFile(const std::filesystem::path& filename,
                                         const std::string& overrideScript)
 {
-    ghoul_assert(!filename.empty(), "Filename must not be empty");
-    ghoul_assert(FileSys.fileExists(filename), "File must exist");
+    ghoul_assert(std::filesystem::is_regular_file(filename), "File must exist");
 
     Configuration result;
 
     // If there is an initial config helper file, load it into the state
-    if (FileSys.fileExists(absPath(InitialConfigHelper))) {
-        ghoul::lua::runScriptFile(result.state, absPath(InitialConfigHelper));
+    if (std::filesystem::is_regular_file(absPath(InitialConfigHelper))) {
+        ghoul::lua::runScriptFile(result.state, absPath(InitialConfigHelper).string());
     }
 
     // Load the configuration file into the state
-    ghoul::lua::runScriptFile(result.state, filename);
+    ghoul::lua::runScriptFile(result.state, filename.string());
 
     if (!overrideScript.empty()) {
         LDEBUGC("Configuration", "Executing Lua script passed through the commandline:");
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index 4efe92c9e6..cc8429fa84 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -31,6 +31,7 @@
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/thread.h>
 #include <chrono>
+#include <filesystem>
 #include <thread>
 
 #ifdef OPENSPACE_CURL_ENABLED
@@ -133,36 +134,36 @@ DownloadManager::DownloadManager(UseMultipleThreads useMultipleThreads)
 
 std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadFile(
                                                                    const std::string& url,
-                                                      const ghoul::filesystem::File& file,
+                                                        const std::filesystem::path& file,
                                                                 OverrideFile overrideFile,
                                                                   FailOnError failOnError,
                                                                 unsigned int timeout_secs,
                                                 DownloadFinishedCallback finishedCallback,
                                                 DownloadProgressCallback progressCallback)
 {
-    if (!overrideFile && FileSys.fileExists(file)) {
+    if (!overrideFile && std::filesystem::is_regular_file(file)) {
         return nullptr;
     }
 
-    std::shared_ptr<FileFuture> future = std::make_shared<FileFuture>(file.filename());
+    std::shared_ptr<FileFuture> future = std::make_shared<FileFuture>(
+        file.filename().string()
+    );
     errno = 0;
 #ifdef WIN32
     FILE* fp;
-    errno_t error = fopen_s(&fp, file.path().c_str(), "wb");
+    errno_t error = fopen_s(&fp, file.string().c_str(), "wb");
     if (error != 0) {
-        LERROR(
-            "Could not open/create file:" + file.path() +
-            ". Errno: " + std::to_string(errno)
-        );
+        LERROR(fmt::format(
+            "Could not open/create file: {}. Errno: {}", file, errno
+        ));
     }
 #else
-    FILE* fp = fopen(file.path().c_str(), "wb"); // write binary
+    FILE* fp = fopen(file.string().c_str(), "wb"); // write binary
 #endif // WIN32
     if (!fp) {
-        LERROR(
-            "Could not open/create file:" + file.path() +
-            ". Errno: " + std::to_string(errno)
-        );
+        LERROR(fmt::format(
+            "Could not open/create file: {}. Errno: {}", file, errno
+        ));
     }
 
     auto downloadFunction = [url, failOnError, timeout_secs,
diff --git a/src/engine/logfactory.cpp b/src/engine/logfactory.cpp
index 90633d26e6..7beffdaa8e 100644
--- a/src/engine/logfactory.cpp
+++ b/src/engine/logfactory.cpp
@@ -89,15 +89,13 @@ namespace {
 namespace openspace {
 
 documentation::Documentation LogFactoryDocumentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "core_logfactory";
-    return doc;
+    return codegen::doc<Parameters>("core_logfactory");
 }
 
 std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictionary) {
     const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    std::string filename = absPath(p.file);
+    std::filesystem::path filename = absPath(p.file);
     bool append = p.append.value_or(true);
     bool timeStamp = p.timeStamping.value_or(true);
     bool dateStamp = p.dateStamping.value_or(true);
@@ -129,11 +127,14 @@ std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictiona
     switch (p.type) {
         case Parameters::Type::Html:
         {
-            std::vector<std::string> cssFiles{ absPath(BootstrapPath), absPath(CssPath) };
-            std::vector<std::string> jsFiles{ absPath(JsPath) };
+            std::vector<std::string> cssFiles{
+                absPath(BootstrapPath).string(),
+                absPath(CssPath).string()
+            };
+            std::vector<std::string> jsFiles{ absPath(JsPath).string() };
 
             return std::make_unique<ghoul::logging::HTMLLog>(
-                filename,
+                filename.string(),
                 ghoul::logging::TextLog::Append(append),
                 ghoul::logging::Log::TimeStamping(timeStamp),
                 ghoul::logging::Log::DateStamping(dateStamp),
@@ -146,7 +147,7 @@ std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictiona
         }
         case Parameters::Type::Text:
             return std::make_unique<ghoul::logging::TextLog>(
-                filename,
+                filename.string(),
                 ghoul::logging::TextLog::Append(append),
                 ghoul::logging::Log::TimeStamping(timeStamp),
                 ghoul::logging::Log::DateStamping(dateStamp),
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index c04c60f985..df7bd75df3 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -95,8 +95,6 @@
 
 namespace {
     constexpr const char* _loggerCat = "OpenSpaceEngine";
-    constexpr const int CacheVersion = 1;
-
 } // namespace
 
 namespace openspace {
@@ -155,9 +153,7 @@ void OpenSpaceEngine::registerPathTokens() {
     // overwrite the default path of the cfg directory
     using T = std::string;
     for (const std::pair<const T, T>& path : global::configuration->pathTokens) {
-        std::string fullKey = ghoul::filesystem::FileSystem::TokenOpeningBraces +
-            path.first +
-            ghoul::filesystem::FileSystem::TokenClosingBraces;
+        std::string fullKey = "${" + path.first + "}";
         LDEBUG(fmt::format("Registering path {}: {}", fullKey, path.second));
 
         const bool overrideBase = (fullKey == "${BASE}");
@@ -189,10 +185,15 @@ void OpenSpaceEngine::initialize() {
         global::versionChecker->requestLatestVersion(versionCheckUrl);
     }
 
-    std::string cacheFolder = absPath("${CACHE}");
-    if (global::configuration->usePerSceneCache) {
-        std::string scene = global::configuration->asset;
-        cacheFolder += "-" + ghoul::filesystem::File(scene).baseName();
+    std::string cacheFolder = absPath("${CACHE}").string();
+    if (global::configuration->usePerProfileCache) {
+        std::string profile = global::configuration->profile;
+        if (profile.empty()) {
+            throw ghoul::RuntimeError(
+                "Unexpected error: Configuration file profile was empty"
+            );
+        }
+        cacheFolder = cacheFolder + "-" + profile;
 
         LINFO(fmt::format("Old cache: {}", absPath("${CACHE}")));
         LINFO(fmt::format("New cache: {}", cacheFolder));
@@ -205,14 +206,13 @@ void OpenSpaceEngine::initialize() {
 
     // Create directories that doesn't exist
     for (const std::string& token : FileSys.tokens()) {
-        if (!FileSys.directoryExists(token)) {
-            std::string p = absPath(token);
-            FileSys.createDirectory(p, ghoul::filesystem::FileSystem::Recursive::Yes);
+        if (!std::filesystem::is_directory(token)) {
+            std::filesystem::create_directories(absPath(token));
         }
     }
 
     try {
-        FileSys.createCacheManager(cacheFolder, CacheVersion);
+        FileSys.createCacheManager(cacheFolder);
     }
     catch (const ghoul::RuntimeError& e) {
         LFATAL("Could not create Cache Manager");
@@ -293,20 +293,20 @@ void OpenSpaceEngine::initialize() {
 
     // Convert profile to scene file (if was provided in configuration file)
     if (!global::configuration->profile.empty()) {
-        std::string inputProfilePath = absPath("${PROFILES}");
-        std::string outputScenePath = absPath("${TEMPORARY}");
+        std::string inputProfilePath = absPath("${PROFILES}").string();
+        std::string outputScenePath = absPath("${TEMPORARY}").string();
         std::string inputProfile = inputProfilePath + "/" + global::configuration->profile
             + ".profile";
-        std::string inputUserProfile = absPath("${USER_PROFILES}") + "/" +
+        std::string inputUserProfile = absPath("${USER_PROFILES}").string() + "/" +
             global::configuration->profile + ".profile";
         std::string outputAsset = outputScenePath + "/" + global::configuration->profile
             + ".asset";
 
-        if (FileSys.fileExists(inputUserProfile)) {
+        if (std::filesystem::is_regular_file(inputUserProfile)) {
             inputProfile = inputUserProfile;
         }
 
-        if (!FileSys.fileExists(inputProfile)) {
+        if (!std::filesystem::is_regular_file(inputProfile)) {
             LERROR(fmt::format(
                 "Could not load profile '{}': File does not exist", inputProfile)
             );
@@ -347,7 +347,7 @@ void OpenSpaceEngine::initialize() {
     // Set up asset loader
     global::openSpaceEngine->_assetManager = std::make_unique<AssetManager>(
         global::scriptEngine->luaState(),
-        FileSys.absPath("${ASSETS}")
+        absPath("${ASSETS}").string()
     );
 
     global::scriptEngine->addLibrary(
@@ -389,7 +389,8 @@ void OpenSpaceEngine::initialize() {
 }
 
 std::string OpenSpaceEngine::generateFilePath(std::string openspaceRelativePath) {
-    std::string path = absPath(openspaceRelativePath);
+    // @TODO (abock, 2021-05-16) This whole function can die, I think
+    std::string path = absPath(openspaceRelativePath).string();
     // Needs to handle either windows (which seems to require double back-slashes)
     // or unix path slashes.
     const std::string search = "\\";
@@ -954,19 +955,16 @@ void OpenSpaceEngine::writeStaticDocumentation() {
 }
 
 void OpenSpaceEngine::createUserDirectoriesIfNecessary() {
-    LTRACE(absPath("${USER}"));
+    LTRACE(absPath("${USER}").string());
 
     if (!std::filesystem::exists(absPath("${USER_ASSETS}"))) {
-        FileSys.createDirectory(absPath("${USER_ASSETS}"),
-            ghoul::filesystem::FileSystem::Recursive::Yes);
+        std::filesystem::create_directories(absPath("${USER_ASSETS}"));
     }
     if (!std::filesystem::exists(absPath("${USER_PROFILES}"))) {
-        FileSys.createDirectory(absPath("${USER_PROFILES}"),
-            ghoul::filesystem::FileSystem::Recursive::Yes);
+        std::filesystem::create_directories(absPath("${USER_PROFILES}"));
     }
     if (!std::filesystem::exists(absPath("${USER_CONFIG}"))) {
-        FileSys.createDirectory(absPath("${USER_CONFIG}"),
-            ghoul::filesystem::FileSystem::Recursive::Yes);
+        std::filesystem::create_directories(absPath("${USER_CONFIG}"));
     }
 }
 
@@ -978,12 +976,13 @@ void OpenSpaceEngine::runGlobalCustomizationScripts() {
     global::scriptEngine->initializeLuaState(state);
 
     for (const std::string& script : global::configuration->globalCustomizationScripts) {
-        std::string s = absPath(script);
-        if (FileSys.fileExists(s)) {
+        std::filesystem::path s = absPath(script);
+        if (std::filesystem::is_regular_file(s)) {
             try {
                 LINFO(fmt::format("Running global customization script: {}", s));
-                ghoul::lua::runScriptFile(state, s);
-            } catch (const ghoul::RuntimeError& e) {
+                ghoul::lua::runScriptFile(state, s.string());
+            }
+            catch (const ghoul::RuntimeError& e) {
                 LERRORC(e.component, e.message);
             }
         }
@@ -999,19 +998,19 @@ void OpenSpaceEngine::loadFonts() {
     using T = std::string;
     for (const std::pair<const T, T>& font : global::configuration->fonts) {
         std::string key = font.first;
-        std::string fontName = absPath(font.second);
+        std::filesystem::path fontName = absPath(font.second);
 
-        if (!FileSys.fileExists(fontName)) {
-            LERROR(fmt::format("Could not find font '{}' for key '{}'", fontName, key));
+        if (!std::filesystem::is_regular_file(fontName)) {
+            LERROR(fmt::format("Could not find font {} for key '{}'", fontName, key));
             continue;
         }
 
-        LDEBUG(fmt::format("Registering font '{}' with key '{}'", fontName, key));
+        LDEBUG(fmt::format("Registering font {} with key '{}'", fontName, key));
         bool success = global::fontManager->registerFontPath(key, fontName);
 
         if (!success) {
             LERROR(fmt::format(
-                "Error registering font '{}' with key '{}'", fontName, key
+                "Error registering font {} with key '{}'", fontName, key
             ));
         }
     }
@@ -1043,7 +1042,7 @@ void OpenSpaceEngine::writeSceneDocumentation() {
 
 
 
-        path = absPath(path) + "/";
+        path = absPath(path).string() + '/';
         _documentationJson += "{\"name\":\"Keybindings\",\"identifier\":\"";
         _documentationJson += global::keybindingManager->jsonName() + "\",";
         _documentationJson += "\"data\":";
@@ -1470,8 +1469,8 @@ void OpenSpaceEngine::handleDragDrop(const std::string& file) {
     std::filesystem::path f(file);
 
     ghoul::lua::LuaState s(ghoul::lua::LuaState::IncludeStandardLibrary::Yes);
-    std::string absolutePath = absPath("${SCRIPTS}/drag_drop_handler.lua");
-    int status = luaL_loadfile(s, absolutePath.c_str());
+    std::filesystem::path absolutePath = absPath("${SCRIPTS}/drag_drop_handler.lua");
+    int status = luaL_loadfile(s, absolutePath.string().c_str());
     if (status != LUA_OK) {
         std::string error = lua_tostring(s, -1);
         LERROR(error);
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index aa16a79db2..7b86f41e8d 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -193,7 +193,7 @@ int setScreenshotFolder(lua_State* L) {
     std::string arg = ghoul::lua::value<std::string>(L);
     lua_pop(L, 0);
 
-    std::string folder = FileSys.absolutePath(arg);
+    std::filesystem::path folder = absPath(arg);
     if (!std::filesystem::exists(folder)) {
         std::filesystem::create_directory(folder);
     }
@@ -204,7 +204,7 @@ int setScreenshotFolder(lua_State* L) {
         ghoul::filesystem::FileSystem::Override::Yes
     );
 
-    global::windowDelegate->setScreenshotFolder(folder);
+    global::windowDelegate->setScreenshotFolder(folder.string());
     return 0;
 }
 
@@ -332,13 +332,8 @@ int createSingleColorImage(lua_State* L) {
 
     const glm::dvec3 color = colorDict.value<glm::dvec3>(key);
 
-    const std::string& fileName = FileSys.cacheManager()->cachedFilename(
-        fmt::format("{}.ppm", name),
-        "",
-        ghoul::filesystem::CacheManager::Persistent::Yes
-    );
-
-    const bool hasCachedFile = FileSys.fileExists(fileName);
+    std::string fileName = FileSys.cacheManager()->cachedFilename(name + ".ppm", "");
+    const bool hasCachedFile = std::filesystem::is_regular_file(fileName);
     if (hasCachedFile) {
         LDEBUGC("OpenSpaceEngine", fmt::format("Cached file '{}' used", fileName));
         ghoul::lua::push(L, fileName);
diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp
index 78a9f97506..91d89fe274 100644
--- a/src/interaction/joystickcamerastates.cpp
+++ b/src/interaction/joystickcamerastates.cpp
@@ -52,8 +52,13 @@ void JoystickCameraStates::updateStateFromInput(const InputState& inputState,
             continue;
         }
 
-        bool hasValue = true;
-        float value = inputState.joystickAxis(i);
+        float rawValue = inputState.joystickAxis(i);
+        float value = rawValue;
+
+        if (t.isSticky) {
+            value = rawValue - _prevAxisValues[i];
+            _prevAxisValues[i] = rawValue;
+        }
 
         if (std::fabs(value) <= t.deadzone) {
             continue;
@@ -67,49 +72,55 @@ void JoystickCameraStates::updateStateFromInput(const InputState& inputState,
             value *= -1.f;
         }
 
-        value = static_cast<float>(value * _sensitivity);
+        if (std::abs(t.sensitivity) > std::numeric_limits<double>::epsilon()) {
+            value = static_cast<float>(value * t.sensitivity * _sensitivity);
+        }
+        else {
+            value = static_cast<float>(value * _sensitivity);
+        }
 
         switch (t.type) {
             case AxisType::None:
                 break;
             case AxisType::OrbitX:
-                globalRotation.first = hasValue;
+                globalRotation.first = true;
                 globalRotation.second.x = value;
                 break;
             case AxisType::OrbitY:
-                globalRotation.first = hasValue;
+                globalRotation.first = true;
                 globalRotation.second.y = value;
                 break;
+            case AxisType::Zoom:
             case AxisType::ZoomIn:
-                zoom.first = hasValue;
+                zoom.first = true;
                 zoom.second += value;
                 break;
             case AxisType::ZoomOut:
-                zoom.first = hasValue;
+                zoom.first = true;
                 zoom.second -= value;
                 break;
             case AxisType::LocalRollX:
-                localRoll.first = hasValue;
+                localRoll.first = true;
                 localRoll.second.x = value;
                 break;
             case AxisType::LocalRollY:
-                localRoll.first = hasValue;
+                localRoll.first = true;
                 localRoll.second.y = value;
                 break;
             case AxisType::GlobalRollX:
-                globalRoll.first = hasValue;
+                globalRoll.first = true;
                 globalRoll.second.x = value;
                 break;
             case AxisType::GlobalRollY:
-                globalRoll.first = hasValue;
+                globalRoll.first = true;
                 globalRoll.second.y = value;
                 break;
             case AxisType::PanX:
-                localRotation.first = hasValue;
+                localRotation.first = true;
                 localRotation.second.x = value;
                 break;
             case AxisType::PanY:
-                localRotation.first = hasValue;
+                localRotation.first = true;
                 localRotation.second.y = value;
                 break;
         }
@@ -167,13 +178,23 @@ void JoystickCameraStates::updateStateFromInput(const InputState& inputState,
 
 void JoystickCameraStates::setAxisMapping(int axis, AxisType mapping,
                                           AxisInvert shouldInvert,
-                                          AxisNormalize shouldNormalize)
+                                          AxisNormalize shouldNormalize,
+                                          bool isSticky,
+                                          double sensitivity)
 {
     ghoul_assert(axis < JoystickInputState::MaxAxes, "axis must be < MaxAxes");
 
     _axisMapping[axis].type = mapping;
     _axisMapping[axis].invert = shouldInvert;
     _axisMapping[axis].normalize = shouldNormalize;
+    _axisMapping[axis].isSticky = isSticky;
+    _axisMapping[axis].sensitivity = sensitivity;
+
+    if (isSticky) {
+        global::joystickInputStates->at(axis).isSticky = true;
+    }
+
+    _prevAxisValues[axis] = global::joystickInputStates->axis(axis);
 }
 
 JoystickCameraStates::AxisInformation JoystickCameraStates::axisMapping(int axis) const {
diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp
index b05c8641e7..b792d021a4 100644
--- a/src/interaction/keybindingmanager.cpp
+++ b/src/interaction/keybindingmanager.cpp
@@ -27,6 +27,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/scripting/scriptengine.h>
+#include <openspace/util/json_helper.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/glm.h>
 #include <sstream>
@@ -195,7 +196,8 @@ std::string KeybindingManager::generateJson() const {
         json << R"("script": ")" << escapedJson(p.second.command) << "\",";
         json << R"("remoteScripting": )"
              << (p.second.synchronization ? "true," : "false,");
-        json << R"("documentation": ")" << escapedJson(p.second.documentation) << "\",";
+        json << R"("documentation": ")"
+             << escapedJson(p.second.documentation) << "\",";
         json << R"("name": ")" << escapedJson(p.second.name) << "\"";
         json << "}";
     }
@@ -228,12 +230,13 @@ scripting::LuaLibrary KeybindingManager::luaLibrary() {
                 "bindKey",
                 &luascriptfunctions::bindKey,
                 {},
-                "string, string [, string]",
+                "string, string [, string, string, string]",
                 "Binds a key by name to a lua string command to execute both locally "
                 "and to broadcast to clients if this is the host of a parallel session. "
                 "The first argument is the key, the second argument is the Lua command "
                 "that is to be executed, and the optional third argument is a human "
-                "readable description of the command for documentation purposes."
+                "readable description of the command for documentation purposes. The"
+                "fourth is the GUI name and fifth is the GUI path, both optional."
             },
             {
                 "bindKeyLocal",
diff --git a/src/interaction/keybindingmanager_lua.inl b/src/interaction/keybindingmanager_lua.inl
index 5627bd26aa..e5da1e3e30 100644
--- a/src/interaction/keybindingmanager_lua.inl
+++ b/src/interaction/keybindingmanager_lua.inl
@@ -40,7 +40,7 @@ int bindKey(lua_State* L) {
     int nArguments = ghoul::lua::checkArgumentsAndThrow(L, { 2, 5 }, "lua::bindKey");
 
     const std::string& key = ghoul::lua::value<std::string>(L, 1);
-    const std::string& command = ghoul::lua::value<std::string>(L, 2);
+    std::string command = ghoul::lua::value<std::string>(L, 2);
 
     if (command.empty()) {
         lua_settop(L, 0);
@@ -85,7 +85,7 @@ int bindKeyLocal(lua_State* L) {
     int nArguments = ghoul::lua::checkArgumentsAndThrow(L, { 2, 5 }, "lua::bindKeyLocal");
 
     const std::string& key = ghoul::lua::value<std::string>(L, 1);
-    const std::string& command = ghoul::lua::value<std::string>(L, 2);
+    std::string command = ghoul::lua::value<std::string>(L, 2);
 
     if (command.empty()) {
         return ghoul::lua::luaError(L, "Command string is empty");
diff --git a/src/interaction/navigationhandler.cpp b/src/interaction/navigationhandler.cpp
index 203a674f1e..c28fca94c6 100644
--- a/src/interaction/navigationhandler.cpp
+++ b/src/interaction/navigationhandler.cpp
@@ -39,6 +39,7 @@
 #include <ghoul/misc/dictionaryluaformatter.h>
 #include <ghoul/misc/profiling.h>
 #include <glm/gtx/vector_angle.hpp>
+#include <filesystem>
 #include <fstream>
 
 namespace {
@@ -457,26 +458,29 @@ void NavigationHandler::saveNavigationState(const std::string& filepath,
     }
 
     if (!filepath.empty()) {
-        std::string absolutePath = absPath(filepath);
+        std::filesystem::path absolutePath = absPath(filepath);
         LINFO(fmt::format("Saving camera position: {}", absolutePath));
 
-        std::ofstream ofs(absolutePath.c_str());
+        std::ofstream ofs(absolutePath);
         ofs << "return " << ghoul::formatLua(state.dictionary());
         ofs.close();
     }
 }
 
 void NavigationHandler::loadNavigationState(const std::string& filepath) {
-    const std::string absolutePath = absPath(filepath);
+    const std::filesystem::path absolutePath = absPath(filepath);
     LINFO(fmt::format("Reading camera state from file: {}", absolutePath));
 
-    if (!FileSys.fileExists(absolutePath)) {
-        throw ghoul::FileNotFoundError(absolutePath, "NavigationState");
+    if (!std::filesystem::is_regular_file(absolutePath)) {
+        throw ghoul::FileNotFoundError(absolutePath.string(), "NavigationState");
     }
 
     ghoul::Dictionary navigationStateDictionary;
     try {
-        ghoul::lua::loadDictionaryFromFile(absolutePath, navigationStateDictionary);
+        ghoul::lua::loadDictionaryFromFile(
+            absolutePath.string(),
+            navigationStateDictionary
+        );
         openspace::documentation::testSpecificationAndThrow(
             NavigationState::Documentation(),
             navigationStateDictionary,
@@ -492,13 +496,17 @@ void NavigationHandler::loadNavigationState(const std::string& filepath) {
 void NavigationHandler::setJoystickAxisMapping(int axis,
                                                JoystickCameraStates::AxisType mapping,
                                             JoystickCameraStates::AxisInvert shouldInvert,
-                                      JoystickCameraStates::AxisNormalize shouldNormalize)
+                                      JoystickCameraStates::AxisNormalize shouldNormalize,
+                                               bool isSticky,
+                                               double sensitivity)
 {
     _orbitalNavigator.joystickStates().setAxisMapping(
         axis,
         mapping,
         shouldInvert,
-        shouldNormalize
+        shouldNormalize,
+        isSticky,
+        sensitivity
     );
 }
 
@@ -553,9 +561,7 @@ std::vector<std::string> NavigationHandler::joystickButtonCommand(int button) co
 }
 
 documentation::Documentation NavigationHandler::NavigationState::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "core_navigation_state";
-    return doc;
+    return codegen::doc<Parameters>("core_navigation_state");
 }
 
 scripting::LuaLibrary NavigationHandler::luaLibrary() {
diff --git a/src/interaction/navigationhandler_lua.inl b/src/interaction/navigationhandler_lua.inl
index 34f6531f51..b31d487e58 100644
--- a/src/interaction/navigationhandler_lua.inl
+++ b/src/interaction/navigationhandler_lua.inl
@@ -190,7 +190,7 @@ int retargetAim(lua_State* L) {
 int bindJoystickAxis(lua_State* L) {
     const int n = ghoul::lua::checkArgumentsAndThrow(
         L,
-        { 2, 4 },
+        { 2, 6 },
         "lua::bindJoystickAxis"
     );
 
@@ -199,12 +199,16 @@ int bindJoystickAxis(lua_State* L) {
 
     const bool shouldInvert = n > 2 ? ghoul::lua::value<bool>(L, 3) : false;
     const bool shouldNormalize = n > 3 ? ghoul::lua::value<bool>(L, 4) : false;
+    const bool isSticky = n > 4 ? ghoul::lua::value<bool>(L, 5) : false;
+    const double sensitivity = n > 5 ? ghoul::lua::value<double>(L, 6) : 0.0;
 
     global::navigationHandler->setJoystickAxisMapping(
         axis,
         ghoul::from_string<interaction::JoystickCameraStates::AxisType>(axisType),
         interaction::JoystickCameraStates::AxisInvert(shouldInvert),
-        interaction::JoystickCameraStates::AxisNormalize(shouldNormalize)
+        interaction::JoystickCameraStates::AxisNormalize(shouldNormalize),
+        isSticky,
+        sensitivity
     );
 
     lua_settop(L, 0);
@@ -223,10 +227,19 @@ int joystickAxis(lua_State* L) {
     lua_settop(L, 0);
     const bool invert = info.invert;
     const bool normalize = info.normalize;
-    ghoul::lua::push(L, ghoul::to_string(info.type), invert, normalize);
+    const bool isSticky = info.isSticky;
+    const double sensitivity = info.sensitivity;
+    ghoul::lua::push(
+        L,
+        ghoul::to_string(info.type),
+        invert,
+        normalize,
+        isSticky,
+        sensitivity
+    );
 
-    ghoul_assert(lua_gettop(L) == 3, "Incorrect number of items left on stack");
-    return 3;
+    ghoul_assert(lua_gettop(L) == 5, "Incorrect number of items left on stack");
+    return 5;
 }
 
 int setJoystickAxisDeadzone(lua_State* L) {
@@ -262,8 +275,8 @@ int bindJoystickButton(lua_State* L) {
     );
 
     const int button = ghoul::lua::value<int>(L, 1);
-    const std::string& command = ghoul::lua::value<std::string>(L, 2);
-    const std::string& documentation = ghoul::lua::value<std::string>(L, 3);
+    std::string command = ghoul::lua::value<std::string>(L, 2);
+    std::string documentation = ghoul::lua::value<std::string>(L, 3);
 
     interaction::JoystickAction action = interaction::JoystickAction::Press;
     if (n >= 4) {
@@ -276,10 +289,10 @@ int bindJoystickButton(lua_State* L) {
 
     global::navigationHandler->bindJoystickButtonCommand(
         button,
-        std::move(command),
+        command,
         action,
         interaction::JoystickCameraStates::ButtonCommandRemote(isRemote),
-        std::move(documentation)
+        documentation
     );
 
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
diff --git a/src/interaction/orbitalnavigator.cpp b/src/interaction/orbitalnavigator.cpp
index b4815e9cc4..b90779a4f4 100644
--- a/src/interaction/orbitalnavigator.cpp
+++ b/src/interaction/orbitalnavigator.cpp
@@ -254,7 +254,12 @@ OrbitalNavigator::OrbitalNavigator()
     , _joystickSensitivity(JoystickSensitivityInfo, 10.f, 1.0f, 50.f)
     , _websocketSensitivity(WebsocketSensitivityInfo, 5.f, 1.0f, 50.f)
     , _useAdaptiveStereoscopicDepth(UseAdaptiveStereoscopicDepthInfo, true)
-    , _stereoscopicDepthOfFocusSurface(StereoscopicDepthOfFocusSurfaceInfo, 8, 0.25, 100)
+    , _stereoscopicDepthOfFocusSurface(
+        StereoscopicDepthOfFocusSurfaceInfo,
+        200000,
+        0.25,
+        500000
+    )
     , _staticViewScaleExponent(StaticViewScaleExponentInfo, 0.f, -30, 10)
     , _retargetInterpolationTime(RetargetInterpolationTimeInfo, 2.0, 0.0, 10.0)
     , _stereoInterpolationTime(StereoInterpolationTimeInfo, 8.0, 0.0, 10.0)
@@ -386,6 +391,7 @@ OrbitalNavigator::OrbitalNavigator()
 
     addProperty(_useAdaptiveStereoscopicDepth);
     addProperty(_staticViewScaleExponent);
+    _stereoscopicDepthOfFocusSurface.setExponent(10.f);
     addProperty(_stereoscopicDepthOfFocusSurface);
 
     addProperty(_retargetInterpolationTime);
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index d89b9c8c11..b29a37bf07 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -47,6 +47,8 @@
 #include <ghoul/font/fontrenderer.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
+#include <algorithm>
+#include <filesystem>
 #include <iomanip>
 
 #ifdef WIN32
@@ -163,11 +165,11 @@ bool SessionRecording::handleRecordingFile(std::string filenameIn) {
         }
     }
 
-    std::string absFilename = absPath("${RECORDINGS}/" + filenameIn);
+    std::filesystem::path absFilename = absPath("${RECORDINGS}/" + filenameIn);
 
-    if (FileSys.fileExists(absFilename)) {
+    if (std::filesystem::is_regular_file(absFilename)) {
         LERROR(fmt::format(
-            "Unable to start recording; file {} already exists.", absFilename.c_str()
+            "Unable to start recording; file {} already exists.", absFilename
         ));
         return false;
     }
@@ -179,28 +181,24 @@ bool SessionRecording::handleRecordingFile(std::string filenameIn) {
     }
 
     if (!_recordFile.is_open() || !_recordFile.good()) {
-        LERROR(fmt::format(
-            "Unable to open file {} for keyframe recording", absFilename.c_str()
-        ));
+        LERROR(fmt::format("Unable to open file {} for keyframe recording", absFilename));
         return false;
     }
     return true;
 }
 
 bool SessionRecording::startRecording(const std::string& filename) {
+    _timeline.clear();
     if (_state == SessionState::Recording) {
         LERROR("Unable to start recording while already in recording mode");
         return false;
     }
-    else if (_state == SessionState::Playback) {
+    else if (_state == SessionState::Playback || _state == SessionState::PlaybackPaused) {
         LERROR("Unable to start recording while in session playback mode");
         return false;
     }
-    if (!FileSys.directoryExists(absPath("${RECORDINGS}"))) {
-        FileSys.createDirectory(
-            absPath("${RECORDINGS}"),
-            ghoul::filesystem::FileSystem::Recursive::Yes
-        );
+    if (!std::filesystem::is_directory(absPath("${RECORDINGS}"))) {
+        std::filesystem::create_directories(absPath("${RECORDINGS}"));
     }
 
     bool recordingFileOK = handleRecordingFile(filename);
@@ -210,6 +208,10 @@ bool SessionRecording::startRecording(const std::string& filename) {
         _playbackActive_camera = false;
         _playbackActive_time = false;
         _playbackActive_script = false;
+        _propertyBaselinesSaved.clear();
+        _keyframesSavePropertiesBaseline_scripts.clear();
+        _keyframesSavePropertiesBaseline_timeline.clear();
+        _recordingEntryNum = 1;
 
         _recordFile << FileHeaderTitle;
         _recordFile.write(FileHeaderVersion, FileHeaderVersionLength);
@@ -223,56 +225,146 @@ bool SessionRecording::startRecording(const std::string& filename) {
 
         _timestampRecordStarted = global::windowDelegate->applicationTime();
 
-        //Record the current delta time so this is preserved in recording
-        double currentDeltaTime = global::timeManager->deltaTime();
-        std::string scriptCommandForInitializingDeltaTime =
-            "openspace.time.setDeltaTime(" + std::to_string(currentDeltaTime) + ")";
-        saveScriptKeyframe(scriptCommandForInitializingDeltaTime);
+        //Record the current delta time as the first property to save in the file.
+        //This needs to be saved as a baseline whether or not it changes during recording.
+        _timestamps3RecordStarted = {
+            _timestampRecordStarted,
+            0.0,
+            global::timeManager->time().j2000Seconds()
+        };
 
+        recordCurrentTimePauseState();
+        recordCurrentTimeRate();
         LINFO("Session recording started");
     }
 
     return recordingFileOK;
 }
 
+void SessionRecording::recordCurrentTimePauseState() {
+    bool isPaused = global::timeManager->isPaused();
+    std::string initialTimePausedCommand = "openspace.time.setPause(" +
+        std::string(isPaused ? "true" : "false") + ")";
+    saveScriptKeyframeToPropertiesBaseline(initialTimePausedCommand);
+}
+
+void SessionRecording::recordCurrentTimeRate() {
+    std::string initialTimeRateCommand = fmt::format(
+        "openspace.time.setDeltaTime({})", global::timeManager->targetDeltaTime()
+    );
+    saveScriptKeyframeToPropertiesBaseline(initialTimeRateCommand);
+}
+
 void SessionRecording::stopRecording() {
     if (_state == SessionState::Recording) {
+        //Add all property baseline scripts to the beginning of the recording file
+        datamessagestructures::ScriptMessage smTmp;
+        for (timelineEntry initPropScripts : _keyframesSavePropertiesBaseline_timeline) {
+            if (initPropScripts.keyframeType == RecordedType::Script) {
+                smTmp._script = _keyframesSavePropertiesBaseline_scripts
+                    [initPropScripts.idxIntoKeyframeTypeArray];
+                saveSingleKeyframeScript(
+                    smTmp,
+                    _timestamps3RecordStarted,
+                    _recordingDataMode,
+                    _recordFile,
+                    _keyframeBuffer
+                );
+            }
+        }
+        for (timelineEntry entry : _timeline) {
+            switch (entry.keyframeType) {
+            case RecordedType::Camera:
+                {
+                    interaction::KeyframeNavigator::CameraPose kf
+                        = _keyframesCamera[entry.idxIntoKeyframeTypeArray];
+                    glm::dquat tmpRotation(
+                        std::move(kf.rotation.w),
+                        std::move(kf.rotation.x),
+                        std::move(kf.rotation.y),
+                        std::move(kf.rotation.z)
+                    );
+                    datamessagestructures::CameraKeyframe kfMsg(
+                        std::move(kf.position),
+                        std::move(tmpRotation),
+                        std::move(kf.focusNode),
+                        std::move(kf.followFocusNodeRotation),
+                        std::move(kf.scale)
+                    );
+                    saveSingleKeyframeCamera(
+                        kfMsg,
+                        entry.t3stamps,
+                        _recordingDataMode,
+                        _recordFile,
+                        _keyframeBuffer
+                    );
+                    break;
+                }
+            case RecordedType::Time:
+                {
+                    datamessagestructures::TimeKeyframe tf
+                        = _keyframesTime[entry.idxIntoKeyframeTypeArray];
+                    saveSingleKeyframeTime(
+                        tf,
+                        entry.t3stamps,
+                        _recordingDataMode,
+                        _recordFile,
+                        _keyframeBuffer
+                    );
+                    break;
+                }
+            case RecordedType::Script:
+                {
+                    smTmp._script = _keyframesScript[entry.idxIntoKeyframeTypeArray];
+                    saveSingleKeyframeScript(
+                        smTmp,
+                        entry.t3stamps,
+                        _recordingDataMode,
+                        _recordFile,
+                        _keyframeBuffer
+                    );
+                    break;
+                }
+            default:
+                {
+                    break;
+                }
+            }
+        }
         _state = SessionState::Idle;
         LINFO("Session recording stopped");
     }
     // Close the recording file
     _recordFile.close();
+    _cleanupNeeded = true;
 }
 
 bool SessionRecording::startPlayback(std::string& filename,
                                      KeyframeTimeRef timeMode,
-                                     bool forceSimTimeAtStart)
+                                     bool forceSimTimeAtStart,
+                                     bool loop)
 {
-    if (isPath(filename)) {
-        LERROR("Playback filename must not contain path (/) elements");
-        return false;
-    }
     std::string absFilename;
-    //Run through conversion in case file is older. Does nothing if the file format
+    // Run through conversion in case file is older. Does nothing if the file format
     // is up-to-date
     filename = convertFile(filename);
-    if (FileSys.fileExists(filename)) {
+    if (std::filesystem::is_regular_file(filename)) {
         absFilename = filename;
     }
     else {
-        absFilename = absPath("${RECORDINGS}/" + filename);
+        absFilename = absPath("${RECORDINGS}/" + filename).string();
     }
 
     if (_state == SessionState::Recording) {
         LERROR("Unable to start playback while in session recording mode");
         return false;
     }
-    else if (_state == SessionState::Playback) {
+    else if (_state == SessionState::Playback || _state == SessionState::PlaybackPaused) {
         LERROR("Unable to start new playback while in session playback mode");
         return false;
     }
 
-    if (!FileSys.fileExists(absFilename)) {
+    if (!std::filesystem::is_regular_file(absFilename)) {
         LERROR("Cannot find the specified playback file.");
         cleanUpPlayback();
         return false;
@@ -280,6 +372,7 @@ bool SessionRecording::startPlayback(std::string& filename,
 
     _playbackLineNum = 1;
     _playbackFilename = absFilename;
+    _playbackLoopMode = loop;
 
     // Open in ASCII first
     _playbackFile.open(_playbackFilename, std::ifstream::in);
@@ -328,56 +421,116 @@ bool SessionRecording::startPlayback(std::string& filename,
         cleanUpPlayback();
         return false;
     }
+    _saveRendering_isFirstFrame = true;
     //Set time reference mode
+    _playbackForceSimTimeAtStart = forceSimTimeAtStart;
     double now = global::windowDelegate->applicationTime();
-    _timestampPlaybackStarted_application = now;
-    _timestampPlaybackStarted_simulation = global::timeManager->time().j2000Seconds();
-    _timestampApplicationStarted_simulation = _timestampPlaybackStarted_simulation - now;
     _playbackTimeReferenceMode = timeMode;
+    initializePlayback_time(now);
 
-    //Set playback flags to true for all modes
-    _playbackActive_camera = true;
-    _playbackActive_script = true;
-    if (UsingTimeKeyframes) {
-        _playbackActive_time = true;
-    }
-
-    global::navigationHandler->keyframeNavigator().setTimeReferenceMode(timeMode, now);
     global::scriptScheduler->setTimeReferenceMode(timeMode);
+    _loadedNodes.clear();
+    populateListofLoadedSceneGraphNodes();
 
-    _setSimulationTimeWithNextCameraKeyframe = forceSimTimeAtStart;
     if (!playbackAddEntriesToTimeline()) {
         cleanUpPlayback();
         return false;
     }
 
-    _hasHitEndOfCameraKeyframes = false;
-    findFirstCameraKeyframeInTimeline();
+    initializePlayback_modeFlags();
+    if (!initializePlayback_timeline()) {
+        cleanUpPlayback();
+        return false;
+    }
 
     LINFO(fmt::format(
         "Playback session started: ({:8.3f},0.0,{:13.3f}) with {}/{}/{} entries, "
         "forceTime={}",
         now, _timestampPlaybackStarted_simulation, _keyframesCamera.size(),
-        _keyframesTime.size(), _keyframesScript.size(), (forceSimTimeAtStart ? 1 : 0)
+        _keyframesTime.size(), _keyframesScript.size(),
+        (_playbackForceSimTimeAtStart ? 1 : 0)
     ));
 
-    global::navigationHandler->triggerPlaybackStart();
-    global::scriptScheduler->triggerPlaybackStart();
-    global::timeManager->triggerPlaybackStart();
-    _state = SessionState::Playback;
+    initializePlayback_triggerStart();
 
     return true;
 }
 
-void SessionRecording::findFirstCameraKeyframeInTimeline() {
+void SessionRecording::initializePlayback_time(double now) {
+    using namespace std::chrono;
+    _timestampPlaybackStarted_application = now;
+    _timestampPlaybackStarted_simulation = global::timeManager->time().j2000Seconds();
+    _timestampApplicationStarted_simulation = _timestampPlaybackStarted_simulation - now;
+    _saveRenderingCurrentRecordedTime_interpolation = steady_clock::now();
+    _saveRenderingClockInterpolation_countsPerSec =
+        system_clock::duration::period::den / system_clock::duration::period::num;
+    _playbackPauseOffset = 0.0;
+    global::navigationHandler->keyframeNavigator().setTimeReferenceMode(
+        _playbackTimeReferenceMode, now);
+}
+
+void SessionRecording::initializePlayback_modeFlags() {
+    _playbackActive_camera = true;
+    _playbackActive_script = true;
+    if (UsingTimeKeyframes) {
+        _playbackActive_time = true;
+    }
+    _hasHitEndOfCameraKeyframes = false;
+}
+
+bool SessionRecording::initializePlayback_timeline() {
+    if (!findFirstCameraKeyframeInTimeline()) {
+        return false;
+    }
+    if (_playbackForceSimTimeAtStart) {
+        Timestamps times = _timeline[_idxTimeline_cameraFirstInTimeline].t3stamps;
+        global::timeManager->setTimeNextFrame(Time(times.timeSim));
+        _saveRenderingCurrentRecordedTime = times.timeRec;
+    }
+    _idxTimeline_nonCamera = 0;
+    _idxTime = 0;
+    _idxScript = 0;
+    _idxTimeline_cameraPtrNext = 0;
+    _idxTimeline_cameraPtrPrev = 0;
+    return true;
+}
+
+void SessionRecording::initializePlayback_triggerStart() {
+    global::navigationHandler->triggerPlaybackStart();
+    global::scriptScheduler->triggerPlaybackStart();
+    global::timeManager->triggerPlaybackStart();
+    _state = SessionState::Playback;
+}
+
+bool SessionRecording::isPlaybackPaused() {
+    return (_state == SessionState::PlaybackPaused);
+}
+
+void SessionRecording::setPlaybackPause(bool pause) {
+    if (pause && _state == SessionState::Playback) {
+        _playbackPausedWithinDeltaTimePause = global::timeManager->isPaused();
+        if (!_playbackPausedWithinDeltaTimePause) {
+            global::timeManager->setPause(true);
+        }
+        _state = SessionState::PlaybackPaused;
+    }
+    else if (!pause && _state == SessionState::PlaybackPaused) {
+        if (!_playbackPausedWithinDeltaTimePause) {
+            global::timeManager->setPause(false);
+        }
+        _state = SessionState::Playback;
+    }
+}
+
+bool SessionRecording::findFirstCameraKeyframeInTimeline() {
     bool foundCameraKeyframe = false;
     for (unsigned int i = 0; i < _timeline.size(); i++) {
         if (doesTimelineEntryContainCamera(i)) {
             _idxTimeline_cameraFirstInTimeline = i;
             _idxTimeline_cameraPtrPrev = _idxTimeline_cameraFirstInTimeline;
             _idxTimeline_cameraPtrNext = _idxTimeline_cameraFirstInTimeline;
-            _cameraFirstInTimeline_timestamp
-                = _timeline[_idxTimeline_cameraFirstInTimeline].timestamp;
+            _cameraFirstInTimeline_timestamp = appropriateTimestamp(
+                _timeline[_idxTimeline_cameraFirstInTimeline].t3stamps);
             foundCameraKeyframe = true;
             break;
         }
@@ -385,6 +538,10 @@ void SessionRecording::findFirstCameraKeyframeInTimeline() {
 
     if (!foundCameraKeyframe) {
         signalPlaybackFinishedForComponent(RecordedType::Camera);
+        return true;
+    }
+    else {
+        return checkIfInitialFocusNodeIsLoaded(_idxTimeline_cameraFirstInTimeline);
     }
 }
 
@@ -403,15 +560,27 @@ void SessionRecording::signalPlaybackFinishedForComponent(RecordedType type) {
     }
 
     if (!_playbackActive_camera && !_playbackActive_time && !_playbackActive_script) {
-        _state = SessionState::Idle;
-        _cleanupNeeded = true;
-        LINFO("Playback session finished");
+        if (_playbackLoopMode) {
+            //Loop back to the beginning to replay
+            _saveRenderingDuringPlayback = false;
+            initializePlayback_time(global::windowDelegate->applicationTime());
+            initializePlayback_modeFlags();
+            initializePlayback_timeline();
+            initializePlayback_triggerStart();
+        }
+        else {
+            _state = SessionState::Idle;
+            _cleanupNeeded = true;
+            LINFO("Playback session finished");
+        }
     }
 }
 
 void SessionRecording::enableTakeScreenShotDuringPlayback(int fps) {
     _saveRenderingDuringPlayback = true;
     _saveRenderingDeltaTime = 1.0 / fps;
+    _saveRenderingDeltaTime_interpolation_usec =
+        std::chrono::microseconds(static_cast<long>(_saveRenderingDeltaTime * 1000000));
 }
 
 void SessionRecording::disableTakeScreenShotDuringPlayback() {
@@ -419,7 +588,7 @@ void SessionRecording::disableTakeScreenShotDuringPlayback() {
 }
 
 void SessionRecording::stopPlayback() {
-    if (_state == SessionState::Playback) {
+    if (_state == SessionState::Playback || _state == SessionState::PlaybackPaused) {
         _state = SessionState::Idle;
         _cleanupNeeded = true;
         LINFO("Session playback stopped");
@@ -434,10 +603,17 @@ void SessionRecording::cleanUpPlayback() {
     ghoul_assert(camera != nullptr, "Camera must not be nullptr");
     Scene* scene = camera->parent()->scene();
     if (!_timeline.empty()) {
-        unsigned int p = _timeline[_idxTimeline_cameraPtrPrev].idxIntoKeyframeTypeArray;
-        const SceneGraphNode* n = scene->sceneGraphNode(_keyframesCamera[p].focusNode);
-        if (n) {
-            global::navigationHandler->orbitalNavigator().setFocusNode(n->identifier());
+        if (_timeline.size() > 0) {
+            unsigned int p =
+                _timeline[_idxTimeline_cameraPtrPrev].idxIntoKeyframeTypeArray;
+            if (_keyframesCamera.size() > 0) {
+                const SceneGraphNode* n = scene->sceneGraphNode(
+                    _keyframesCamera[p].focusNode);
+                if (n) {
+                    global::navigationHandler->orbitalNavigator().setFocusNode(
+                        n->identifier());
+                }
+            }
         }
     }
     global::scriptScheduler->stopPlayback();
@@ -449,6 +625,10 @@ void SessionRecording::cleanUpPlayback() {
     _keyframesCamera.clear();
     _keyframesTime.clear();
     _keyframesScript.clear();
+    _keyframesSavePropertiesBaseline_scripts.clear();
+    _keyframesSavePropertiesBaseline_timeline.clear();
+    _propertyBaselinesSaved.clear();
+    _loadedNodes.clear();
     _idxTimeline_nonCamera = 0;
     _idxTime = 0;
     _idxScript = 0;
@@ -456,6 +636,10 @@ void SessionRecording::cleanUpPlayback() {
     _idxTimeline_cameraPtrPrev = 0;
     _hasHitEndOfCameraKeyframes = false;
     _saveRenderingDuringPlayback = false;
+    _saveRendering_isFirstFrame = true;
+    _playbackPauseOffset = 0.0;
+    _playbackLoopMode = false;
+    _playbackForceSimTimeAtStart = false;
 
     _cleanupNeeded = false;
 }
@@ -533,11 +717,15 @@ bool SessionRecording::hasCameraChangedFromPrev(
     return hasChanged;
 }
 
-void SessionRecording::saveCameraKeyframe() {
-    if (_state != SessionState::Recording) {
-        return;
-    }
+SessionRecording::Timestamps SessionRecording::generateCurrentTimestamp3(double kfTime) {
+    return {
+        kfTime,
+        kfTime - _timestampRecordStarted,
+        global::timeManager->time().j2000Seconds()
+    };
+}
 
+void SessionRecording::saveCameraKeyframeToTimeline() {
     const SceneGraphNode* an = global::navigationHandler->orbitalNavigator().anchorNode();
     if (!an) {
         return;
@@ -547,12 +735,9 @@ void SessionRecording::saveCameraKeyframe() {
     // & orientation of camera
     datamessagestructures::CameraKeyframe kf = _externInteract.generateCameraKeyframe();
 
-    Timestamps times = {
-        kf._timestamp,
-        kf._timestamp - _timestampRecordStarted,
-        global::timeManager->time().j2000Seconds()
-    };
-    saveSingleKeyframeCamera(kf, times, _recordingDataMode, _recordFile, _keyframeBuffer);
+    Timestamps times = generateCurrentTimestamp3(kf._timestamp);
+    interaction::KeyframeNavigator::CameraPose pbFrame(std::move(kf));
+    addKeyframe(times, pbFrame, _recordingEntryNum++);
 }
 
 void SessionRecording::saveHeaderBinary(Timestamps& times,
@@ -601,20 +786,12 @@ void SessionRecording::saveCameraKeyframeAscii(Timestamps& times,
     saveKeyframeToFile(keyframeLine.str(), file);
 }
 
-void SessionRecording::saveTimeKeyframe() {
-    if (_state != SessionState::Recording) {
-        return;
-    }
-
+void SessionRecording::saveTimeKeyframeToTimeline() {
     //Create a time keyframe, then call to populate it with current time props
     datamessagestructures::TimeKeyframe kf = _externInteract.generateTimeKeyframe();
 
-    Timestamps times = {
-        kf._timestamp,
-        kf._timestamp - _timestampRecordStarted,
-        global::timeManager->time().j2000Seconds()
-    };
-    saveSingleKeyframeTime(kf, times, _recordingDataMode, _recordFile, _keyframeBuffer);
+    Timestamps times = generateCurrentTimestamp3(kf._timestamp);
+    addKeyframe(times, kf, _recordingEntryNum++);
 }
 
 void SessionRecording::saveTimeKeyframeBinary(Timestamps& times,
@@ -640,30 +817,68 @@ void SessionRecording::saveTimeKeyframeAscii(Timestamps& times,
     saveKeyframeToFile(keyframeLine.str(), file);
 }
 
-void SessionRecording::saveScriptKeyframe(std::string scriptToSave)
+void SessionRecording::saveScriptKeyframeToTimeline(std::string script)
 {
-    if (_state != SessionState::Recording) {
-        return;
+    if (doesStartWithSubstring(script, scriptReturnPrefix)) {
+        script = script.substr(scriptReturnPrefix.length());
     }
-
+    for (std::string reject : _scriptRejects) {
+        if (doesStartWithSubstring(script, reject)) {
+            return;
+        }
+    }
+    trimCommandsFromScriptIfFound(script);
+    replaceCommandsFromScriptIfFound(script);
     datamessagestructures::ScriptMessage sm
-        = _externInteract.generateScriptMessage(scriptToSave);
+        = _externInteract.generateScriptMessage(script);
 
-    Timestamps times = {
-        sm._timestamp,
-        sm._timestamp - _timestampRecordStarted,
-        global::timeManager->time().j2000Seconds()
-    };
+    Timestamps times = generateCurrentTimestamp3(sm._timestamp);
+    addKeyframe(times, sm._script, _playbackLineNum);
+}
 
-    saveSingleKeyframeScript(
-        sm,
+bool SessionRecording::doesStartWithSubstring(const std::string& s,
+                                              const std::string& matchSubstr)
+{
+    return (s.substr(0, matchSubstr.length()).compare(matchSubstr) == 0);
+}
+
+void SessionRecording::saveScriptKeyframeToPropertiesBaseline(std::string script) {
+    Timestamps times
+        = generateCurrentTimestamp3(global::windowDelegate->applicationTime());
+    size_t indexIntoScriptKeyframesFromMainTimeline
+        = _keyframesSavePropertiesBaseline_scripts.size();
+    _keyframesSavePropertiesBaseline_scripts.push_back(std::move(script));
+    addKeyframeToTimeline(
+        _keyframesSavePropertiesBaseline_timeline,
+        RecordedType::Script,
+        indexIntoScriptKeyframesFromMainTimeline,
         times,
-        _recordingDataMode,
-        _recordFile,
-        _keyframeBuffer
+        0
     );
 }
 
+void SessionRecording::trimCommandsFromScriptIfFound(std::string& script)
+{
+    for (std::string trimSnippet : _scriptsToBeTrimmed) {
+        auto findIdx = script.find(trimSnippet);
+        if (findIdx != std::string::npos) {
+            auto findClosingParens = script.find_first_of(')', findIdx);
+            script.erase(findIdx, findClosingParens + 1);
+        }
+    }
+}
+
+void SessionRecording::replaceCommandsFromScriptIfFound(std::string& script)
+{
+    for (ScriptSubstringReplace replacementSnippet : _scriptsToBeReplaced) {
+        auto findIdx = script.find(replacementSnippet.substringFound);
+        if (findIdx != std::string::npos) {
+            script.erase(findIdx, replacementSnippet.substringFound.length());
+            script.insert(findIdx, replacementSnippet.substringReplacement);
+        }
+    }
+}
+
 void SessionRecording::saveScriptKeyframeBinary(Timestamps& times,
                                                 datamessagestructures::ScriptMessage& sm,
                                                 unsigned char* smBuffer,
@@ -689,16 +904,47 @@ void SessionRecording::saveScriptKeyframeAscii(Timestamps& times,
     saveKeyframeToFile(keyframeLine.str(), file);
 }
 
+void SessionRecording::savePropertyBaseline(properties::Property& prop) {
+    std::string propIdentifier = prop.fullyQualifiedIdentifier();
+    if (isPropertyAllowedForBaseline(propIdentifier)) {
+        bool isPropAlreadySaved = (
+            std::find(
+                _propertyBaselinesSaved.begin(),
+                _propertyBaselinesSaved.end(),
+                propIdentifier
+            )
+            != _propertyBaselinesSaved.end()
+            );
+        if (!isPropAlreadySaved) {
+            std::string initialScriptCommand = fmt::format(
+                "openspace.setPropertyValueSingle(\"{}\", {})",
+                propIdentifier, prop.getStringValue()
+            );
+            saveScriptKeyframeToPropertiesBaseline(initialScriptCommand);
+            _propertyBaselinesSaved.push_back(propIdentifier);
+        }
+    }
+}
+
+bool SessionRecording::isPropertyAllowedForBaseline(const std::string& propString) {
+    for (std::string reject : _propertyBaselineRejects) {
+        if (doesStartWithSubstring(propString, reject)) {
+            return false;
+        }
+    }
+    return true;
+}
+
 void SessionRecording::preSynchronization() {
     ZoneScoped
 
     if (_state == SessionState::Recording) {
-        saveCameraKeyframe();
+        saveCameraKeyframeToTimeline();
         if (UsingTimeKeyframes) {
-            saveTimeKeyframe();
+            saveTimeKeyframeToTimeline();
         }
     }
-    else if (_state == SessionState::Playback) {
+    else if (_state == SessionState::Playback || _state == SessionState::PlaybackPaused) {
         moveAheadInTime();
     }
     else if (_cleanupNeeded) {
@@ -743,11 +989,12 @@ bool SessionRecording::isRecording() const {
 }
 
 bool SessionRecording::isPlayingBack() const {
-    return (_state == SessionState::Playback);
+    return (_state == SessionState::Playback || _state == SessionState::PlaybackPaused);
 }
 
 bool SessionRecording::isSavingFramesDuringPlayback() const {
-    return (_state == SessionState::Playback && _saveRenderingDuringPlayback);
+    return ((_state == SessionState::Playback || _state == SessionState::PlaybackPaused)
+            && _saveRenderingDuringPlayback);
 }
 
 SessionRecording::SessionState SessionRecording::state() const {
@@ -835,18 +1082,16 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
     return parsingStatusOk;
 }
 
-double SessionRecording::appropriateTimestamp(double timeOs,
-                                              double timeRec,
-                                              double timeSim)
+double SessionRecording::appropriateTimestamp(Timestamps t3stamps)
 {
     if (_playbackTimeReferenceMode == KeyframeTimeRef::Relative_recordedStart) {
-        return timeRec;
+        return t3stamps.timeRec;
     }
     else if (_playbackTimeReferenceMode == KeyframeTimeRef::Absolute_simTimeJ2000) {
-        return timeSim;
+        return t3stamps.timeSim;
     }
     else {
-        return timeOs;
+        return t3stamps.timeOs;
     }
 }
 
@@ -886,13 +1131,13 @@ double SessionRecording::currentTime() const {
     }
     else if (_playbackTimeReferenceMode == KeyframeTimeRef::Relative_recordedStart) {
         return (global::windowDelegate->applicationTime() -
-                _timestampPlaybackStarted_application);
+                _timestampPlaybackStarted_application) - _playbackPauseOffset;
     }
     else if (_playbackTimeReferenceMode == KeyframeTimeRef::Absolute_simTimeJ2000) {
         return global::timeManager->time().j2000Seconds();
     }
     else {
-        return global::windowDelegate->applicationTime();
+        return global::windowDelegate->applicationTime() - _playbackPauseOffset;
     }
 }
 
@@ -910,6 +1155,12 @@ double SessionRecording::fixedDeltaTimeDuringFrameOutput() const {
     }
 }
 
+std::chrono::steady_clock::time_point
+SessionRecording::currentPlaybackInterpolationTime() const
+{
+    return _saveRenderingCurrentRecordedTime_interpolation;
+}
+
 bool SessionRecording::playbackCamera() {
     Timestamps times;
     datamessagestructures::CameraKeyframe kf;
@@ -923,16 +1174,13 @@ bool SessionRecording::playbackCamera() {
         _playbackLineNum
     );
 
-    if (_setSimulationTimeWithNextCameraKeyframe) {
-        global::timeManager->setTimeNextFrame(Time(times.timeSim));
-        _setSimulationTimeWithNextCameraKeyframe = false;
-        _saveRenderingCurrentRecordedTime = times.timeRec;
-    }
-    double timeRef = appropriateTimestamp(times.timeOs, times.timeRec, times.timeSim);
-
     interaction::KeyframeNavigator::CameraPose pbFrame(std::move(kf));
     if (success) {
-        success = addKeyframe(timeRef, pbFrame, _playbackLineNum);
+        success = addKeyframe(
+            {times.timeOs, times.timeRec, times.timeSim},
+            pbFrame,
+            _playbackLineNum
+        );
     }
     return success;
 }
@@ -1015,7 +1263,6 @@ bool SessionRecording::readCameraKeyframeBinary(Timestamps& times,
         ));
         return false;
     }
-    times.timeOs = kf._timestamp;
 
     if (!file) {
         LINFO(fmt::format(
@@ -1062,12 +1309,13 @@ bool SessionRecording::playbackTimeChange() {
         _playbackLineNum
     );
     kf._timestamp = equivalentApplicationTime(times.timeOs, times.timeRec, times.timeSim);
-
     kf._time = kf._timestamp + _timestampApplicationStarted_simulation;
-    //global::timeManager.addKeyframe(timeRef, pbFrame._timestamp);
-    //_externInteract.timeInteraction(pbFrame);
     if (success) {
-        success = addKeyframe(kf._timestamp, kf, _playbackLineNum);
+        success = addKeyframe(
+            {times.timeOs, times.timeRec, times.timeSim},
+            kf,
+            _playbackLineNum
+        );
     }
     return success;
 }
@@ -1207,13 +1455,118 @@ bool SessionRecording::playbackScript() {
         _playbackLineNum
     );
 
-    double timeRef = appropriateTimestamp(times.timeOs, times.timeRec, times.timeSim);
+    success = checkIfScriptUsesScenegraphNode(kf._script);
+
     if (success) {
-        success = addKeyframe(timeRef, kf._script, _playbackLineNum);
+        success = addKeyframe(
+            {times.timeOs, times.timeRec, times.timeSim},
+            kf._script,
+            _playbackLineNum
+        );
     }
     return success;
 }
 
+void SessionRecording::populateListofLoadedSceneGraphNodes() {
+    std::vector<SceneGraphNode*> nodes =
+        global::renderEngine->scene()->allSceneGraphNodes();
+    for (SceneGraphNode* n : nodes) {
+        _loadedNodes.push_back(n->identifier());
+    }
+}
+
+bool SessionRecording::checkIfScriptUsesScenegraphNode(std::string s) {
+    if (s.rfind(scriptReturnPrefix, 0) == 0) {
+        s.erase(0, scriptReturnPrefix.length());
+    }
+    //This works for both setPropertyValue and setPropertyValueSingle
+    if (s.rfind("openspace.setPropertyValue", 0) == 0) {
+        std::string found;
+        if (s.find("(\"") != std::string::npos) {
+            std::string subj = s.substr(s.find("(\"") + 2);
+            checkForScenegraphNodeAccess_Scene(subj, found);
+            checkForScenegraphNodeAccess_Nav(subj, found);
+            if (found.length() > 0) {
+                auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), found);
+                if (it == _loadedNodes.end()) {
+                    LERROR(fmt::format(
+                        "Playback file requires scenegraph node '{}', which is "
+                        "not currently loaded", found
+                    ));
+                    return false;
+                }
+            }
+        }
+    }
+    return true;
+}
+
+void SessionRecording::checkForScenegraphNodeAccess_Scene(std::string& s,
+                                                          std::string& result)
+{
+    const std::string scene = "Scene.";
+    auto posScene = s.find(scene);
+    if (posScene != std::string::npos) {
+        auto posDot = s.find(".", posScene + scene.length() + 1);
+        if (posDot > posScene && posDot != std::string::npos) {
+            result = s.substr(posScene + scene.length(), posDot
+                - (posScene + scene.length()));
+        }
+    }
+}
+
+void SessionRecording::checkForScenegraphNodeAccess_Nav(std::string& s,
+                                                        std::string& result)
+{
+    const std::string nextTerm = "NavigationHandler.OrbitalNavigator.";
+    auto posNav = s.find(nextTerm);
+    if (posNav != std::string::npos) {
+        for (std::string accessName : _navScriptsUsingNodes) {
+            if (s.substr(posNav + nextTerm.length()).rfind(accessName) == 0) {
+                std::string postName = s.substr(posNav + nextTerm.length()
+                    + accessName.length() + 2);
+                eraseSpacesFromString(postName);
+                result = getNameFromSurroundingQuotes(postName);
+            }
+        }
+    }
+}
+
+void SessionRecording::eraseSpacesFromString(std::string& s) {
+    s.erase(std::remove_if(s.begin(), s.end(), ::isspace), s.end());
+}
+
+std::string SessionRecording::getNameFromSurroundingQuotes(std::string& s) {
+    std::string result;
+    char quote = s.at(0);
+    //Handle either ' or " marks
+    if (quote == '\'' || quote == '\"') {
+        size_t quoteCount = std::count(s.begin(), s.end(), quote);
+        //Must be an opening and closing quote char
+        if (quoteCount == 2) {
+            result = s.substr(1, s.rfind(quote) - 1);
+        }
+    }
+    return result;
+}
+
+bool SessionRecording::checkIfInitialFocusNodeIsLoaded(unsigned int camIdx1) {
+    if (_keyframesCamera.size() > 0) {
+        std::string startFocusNode
+            = _keyframesCamera[_timeline[camIdx1].idxIntoKeyframeTypeArray].focusNode;
+        auto it = std::find(_loadedNodes.begin(), _loadedNodes.end(), startFocusNode);
+        if (it == _loadedNodes.end()) {
+            LERROR(fmt::format(
+                "Playback file requires scenegraph node '{}', which is "
+                "not currently loaded", startFocusNode
+            ));
+            return false;
+        }
+    }
+    return true;
+}
+
+
 bool SessionRecording::convertScript(std::stringstream& inStream, DataMode mode,
                                      int lineNum, std::string& inputLine,
                                      std::ofstream& outFile, unsigned char* buffer)
@@ -1326,57 +1679,16 @@ bool SessionRecording::readScriptKeyframeAscii(Timestamps& times,
     return true;
 }
 
-bool SessionRecording::addKeyframe(double timestamp,
-                                   interaction::KeyframeNavigator::CameraPose keyframe,
-                                   int lineNum)
-{
-    size_t indexIntoCameraKeyframesFromMainTimeline = _keyframesCamera.size();
-    _keyframesCamera.push_back(std::move(keyframe));
-    return addKeyframeToTimeline(
-        RecordedType::Camera,
-        indexIntoCameraKeyframesFromMainTimeline,
-        timestamp,
-        lineNum
-    );
-}
-
-bool SessionRecording::addKeyframe(double timestamp,
-                                   datamessagestructures::TimeKeyframe keyframe,
-                                   int lineNum)
-{
-    size_t indexIntoTimeKeyframesFromMainTimeline = _keyframesTime.size();
-    _keyframesTime.push_back(std::move(keyframe));
-    return addKeyframeToTimeline(
-        RecordedType::Time,
-        indexIntoTimeKeyframesFromMainTimeline,
-        timestamp,
-        lineNum
-    );
-}
-
-bool SessionRecording::addKeyframe(double timestamp,
-                                   std::string scriptToQueue,
-                                   int lineNum)
-{
-    size_t indexIntoScriptKeyframesFromMainTimeline = _keyframesScript.size();
-    _keyframesScript.push_back(std::move(scriptToQueue));
-    return addKeyframeToTimeline(
-        RecordedType::Script,
-        indexIntoScriptKeyframesFromMainTimeline,
-        timestamp,
-        lineNum
-    );
-}
-
-bool SessionRecording::addKeyframeToTimeline(RecordedType type,
+bool SessionRecording::addKeyframeToTimeline(std::vector<timelineEntry>& timeline,
+                                             RecordedType type,
                                              size_t indexIntoTypeKeyframes,
-                                             double timestamp, int lineNum)
+                                             Timestamps t3stamps, int lineNum)
 {
     try {
-        _timeline.push_back({
+        timeline.push_back({
             type,
             static_cast<unsigned int>(indexIntoTypeKeyframes),
-            timestamp
+            t3stamps
         });
     }
     catch(...) {
@@ -1390,10 +1702,70 @@ bool SessionRecording::addKeyframeToTimeline(RecordedType type,
     return true;
 }
 
+bool SessionRecording::addKeyframe(Timestamps t3stamps,
+                                   interaction::KeyframeNavigator::CameraPose keyframe,
+                                   int lineNum)
+{
+    size_t indexIntoCameraKeyframesFromMainTimeline = _keyframesCamera.size();
+    _keyframesCamera.push_back(std::move(keyframe));
+    return addKeyframeToTimeline(
+        _timeline,
+        RecordedType::Camera,
+        indexIntoCameraKeyframesFromMainTimeline,
+        t3stamps,
+        lineNum
+    );
+}
+
+bool SessionRecording::addKeyframe(Timestamps t3stamps,
+                                   datamessagestructures::TimeKeyframe keyframe,
+                                   int lineNum)
+{
+    size_t indexIntoTimeKeyframesFromMainTimeline = _keyframesTime.size();
+    _keyframesTime.push_back(std::move(keyframe));
+    return addKeyframeToTimeline(
+        _timeline,
+        RecordedType::Time,
+        indexIntoTimeKeyframesFromMainTimeline,
+        t3stamps,
+        lineNum
+    );
+}
+
+bool SessionRecording::addKeyframe(Timestamps t3stamps,
+                                   std::string scriptToQueue,
+                                   int lineNum)
+{
+    size_t indexIntoScriptKeyframesFromMainTimeline = _keyframesScript.size();
+    _keyframesScript.push_back(std::move(scriptToQueue));
+    return addKeyframeToTimeline(
+        _timeline,
+        RecordedType::Script,
+        indexIntoScriptKeyframesFromMainTimeline,
+        t3stamps,
+        lineNum
+    );
+}
+
 void SessionRecording::moveAheadInTime() {
+    using namespace std::chrono;
+
+    bool paused = global::timeManager->isPaused();
+    if (_state == SessionState::PlaybackPaused) {
+        _playbackPauseOffset
+            += global::windowDelegate->applicationTime() - _previousTime;
+    }
+    _previousTime = global::windowDelegate->applicationTime();
+
     double currTime = currentTime();
     lookForNonCameraKeyframesThatHaveComeDue(currTime);
     updateCameraWithOrWithoutNewKeyframes(currTime);
+    //Unfortunately the first frame is sometimes rendered because globebrowsing reports
+    // that all chunks are rendered when they apparently are not.
+    if (_saveRendering_isFirstFrame) {
+        _saveRendering_isFirstFrame = false;
+        return;
+    }
     if (isSavingFramesDuringPlayback()) {
         // Check if renderable in focus is still resolving tile loading
         // do not adjust time while we are doing this, or take screenshot
@@ -1401,8 +1773,12 @@ void SessionRecording::moveAheadInTime() {
             global::navigationHandler->orbitalNavigator().anchorNode();
         const Renderable* focusRenderable = focusNode->renderable();
         if (!focusRenderable || focusRenderable->renderedWithDesiredData()) {
-            _saveRenderingCurrentRecordedTime += _saveRenderingDeltaTime;
-            global::renderEngine->takeScreenshot();
+            if (!paused) {
+                _saveRenderingCurrentRecordedTime_interpolation +=
+                    _saveRenderingDeltaTime_interpolation_usec;
+               _saveRenderingCurrentRecordedTime += _saveRenderingDeltaTime;
+                global::renderEngine->takeScreenshot();
+            }
         }
     }
 }
@@ -1462,7 +1838,8 @@ bool SessionRecording::findNextFutureCameraIndex(double currTime) {
         if (doesTimelineEntryContainCamera(seekAheadIndex)) {
             unsigned int indexIntoCameraKeyframes =
                 _timeline[seekAheadIndex].idxIntoKeyframeTypeArray;
-            double seekAheadKeyframeTimestamp = _timeline[seekAheadIndex].timestamp;
+            double seekAheadKeyframeTimestamp
+                = appropriateTimestamp(_timeline[seekAheadIndex].t3stamps);
 
             if (indexIntoCameraKeyframes >= (_keyframesCamera.size() - 1)) {
                 _hasHitEndOfCameraKeyframes = true;
@@ -1482,7 +1859,7 @@ bool SessionRecording::findNextFutureCameraIndex(double currTime) {
         }
 
         double interpolationUpperBoundTimestamp =
-            _timeline[_idxTimeline_cameraPtrNext].timestamp;
+            appropriateTimestamp(_timeline[_idxTimeline_cameraPtrNext].t3stamps);
         if ((currTime > interpolationUpperBoundTimestamp) && _hasHitEndOfCameraKeyframes)
         {
             _idxTimeline_cameraPtrPrev = _idxTimeline_cameraPtrNext;
@@ -1557,9 +1934,9 @@ bool SessionRecording::processCameraKeyframe(double now) {
     }
 
     // getPrevTimestamp();
-    double prevTime = _timeline[_idxTimeline_cameraPtrPrev].timestamp;
+    double prevTime = appropriateTimestamp(_timeline[_idxTimeline_cameraPtrPrev].t3stamps);
     // getNextTimestamp();
-    double nextTime = _timeline[_idxTimeline_cameraPtrNext].timestamp;
+    double nextTime = appropriateTimestamp(_timeline[_idxTimeline_cameraPtrNext].t3stamps);
 
     double t;
     if ((nextTime - prevTime) < 1e-7) {
@@ -1622,10 +1999,10 @@ double SessionRecording::getNextTimestamp() {
         return 0.0;
     }
     else if (_idxTimeline_nonCamera < _timeline.size()) {
-        return _timeline[_idxTimeline_nonCamera].timestamp;
+        return appropriateTimestamp(_timeline[_idxTimeline_nonCamera].t3stamps);
     }
     else {
-        return _timeline.back().timestamp;
+        return appropriateTimestamp(_timeline.back().t3stamps);
     }
 }
 
@@ -1634,13 +2011,13 @@ double SessionRecording::getPrevTimestamp() {
         return 0.0;
     }
     else if (_idxTimeline_nonCamera == 0) {
-        return _timeline.front().timestamp;
+        return appropriateTimestamp(_timeline.front().t3stamps);
     }
     else if (_idxTimeline_nonCamera < _timeline.size()) {
-        return _timeline[_idxTimeline_nonCamera - 1].timestamp;
+        return appropriateTimestamp(_timeline[_idxTimeline_nonCamera - 1].t3stamps);
     }
     else {
-        return _timeline.back().timestamp;
+        return appropriateTimestamp(_timeline.back().t3stamps);
     }
 }
 
@@ -1710,23 +2087,28 @@ void SessionRecording::removeStateChangeCallback(CallbackHandle handle) {
 }
 
 std::vector<std::string> SessionRecording::playbackList() const {
-    const std::string path = absPath("${RECORDINGS}");
+    const std::filesystem::path path = absPath("${RECORDINGS}");
 
     std::vector<std::string> fileList;
-    ghoul::filesystem::Directory currentDir(path);
-    std::vector<std::string> allInputFiles = currentDir.readFiles();
-    for (const std::string& f : allInputFiles) {
-        // Remove path and keep only the filename
-        const std::string filename = f.substr(path.length() + 1, f.length() - path.length() - 1);
-        bool isHidden = false;
+    if (std::filesystem::is_directory(path)) {
+        namespace fs = std::filesystem;
+        for (const fs::directory_entry& e : fs::directory_iterator(path)) {
+            if (!e.is_regular_file()) {
+                continue;
+            }
+
+            // Remove path and keep only the filename
+            const std::string filename = e.path().filename().string();
 #ifdef WIN32
-        DWORD attributes = GetFileAttributes(f.c_str());
-        isHidden = attributes & FILE_ATTRIBUTE_HIDDEN;
+            DWORD attributes = GetFileAttributes(e.path().string().c_str());
+            bool isHidden = attributes & FILE_ATTRIBUTE_HIDDEN;
 #else
-        isHidden = filename.rfind(".", 0) != 0;
+            bool isHidden = filename.rfind(".", 0) != 0;
 #endif // WIN32
-        if (!isHidden) { //Don't add hidden files
-            fileList.push_back(filename);
+            if (!isHidden) {
+                // Don't add hidden files
+                fileList.push_back(filename);
+            }
         }
     }
     return fileList;
@@ -1790,18 +2172,14 @@ void SessionRecording::readFileIntoStringStream(std::string filename,
                                                 std::ifstream& inputFstream,
                                                 std::stringstream& stream)
 {
-    if (isPath(filename)) {
-        throw ConversionError("Playback filename must not contain path (/) elements");
-    }
-    std::string conversionInFilename = absPath("${RECORDINGS}/" + filename);
-    if (!FileSys.fileExists(conversionInFilename)) {
+    std::filesystem::path conversionInFilename = absPath("${RECORDINGS}/" + filename);
+    if (!std::filesystem::is_regular_file(conversionInFilename)) {
         throw ConversionError(fmt::format(
-            "Cannot find the specified playback file '{}' to convert.",
-            conversionInFilename
+            "Cannot find the specified playback file {} to convert", conversionInFilename
         ));
     }
 
-    DataMode mode = readModeFromHeader(conversionInFilename);
+    DataMode mode = readModeFromHeader(conversionInFilename.string());
 
     stream.str("");
     stream.clear();
@@ -2093,7 +2471,7 @@ std::string SessionRecording::determineConversionOutFilename(const std::string f
         filenameSansExtension = filename.substr(0, filename.find_last_of("."));
     }
     filenameSansExtension += "_" + fileFormatVersion() + "-" + targetFileFormatVersion();
-    return absPath("${RECORDINGS}/" + filenameSansExtension + fileExtension);
+    return absPath("${RECORDINGS}/" + filenameSansExtension + fileExtension).string();
 }
 
 bool SessionRecording_legacy_0085::convertScript(std::stringstream& inStream,
@@ -2158,12 +2536,15 @@ scripting::LuaLibrary SessionRecording::luaLibrary() {
                 "startPlayback",
                 &luascriptfunctions::startPlaybackDefault,
                 {},
-                "string",
+                "string [, bool]",
                 "Starts a playback session with keyframe times that are relative to "
                 "the time since the recording was started (the same relative time "
                 "applies to the playback). When playback starts, the simulation time "
                 "is automatically set to what it was at recording time. The string "
-                "argument is the filename to pull playback keyframes from."
+                "argument is the filename to pull playback keyframes from (the file "
+                "path is relative to the RECORDINGS variable specified in the config "
+                "file). If a second input value of true is given, then playback will "
+                "continually loop until it is manually stopped."
             },
             {
                 "startPlaybackApplicationTime",
@@ -2172,17 +2553,22 @@ scripting::LuaLibrary SessionRecording::luaLibrary() {
                 "string",
                 "Starts a playback session with keyframe times that are relative to "
                 "application time (seconds since OpenSpace application started). "
-                "The string argument is the filename to pull playback keyframes from."
+                "The string argument is the filename to pull playback keyframes from "
+                "(the file path is relative to the RECORDINGS variable specified in the "
+                "config file)."
             },
             {
                 "startPlaybackRecordedTime",
                 &luascriptfunctions::startPlaybackRecordedTime,
                 {},
-                "string",
+                "string [, bool]",
                 "Starts a playback session with keyframe times that are relative to "
                 "the time since the recording was started (the same relative time "
                 "applies to the playback). The string argument is the filename to pull "
-                "playback keyframes from."
+                "playback keyframes from (the file path is relative to the RECORDINGS "
+                "variable specified in the config file). If a second input value of "
+                "true is given, then playback will continually loop until it is "
+                "manually stopped."
             },
             {
                 "startPlaybackSimulationTime",
@@ -2191,7 +2577,8 @@ scripting::LuaLibrary SessionRecording::luaLibrary() {
                 "string",
                 "Starts a playback session with keyframe times that are relative to "
                 "the simulated date & time. The string argument is the filename to pull "
-                "playback keyframes from."
+                "playback keyframes from (the file path is relative to the RECORDINGS "
+                "variable specified in the config file)."
             },
             {
                 "stopPlayback",
@@ -2224,6 +2611,28 @@ scripting::LuaLibrary SessionRecording::luaLibrary() {
                 "Performs a conversion of the specified file to the most most recent "
                 "file format, creating a copy of the recording file."
             },
+            {
+                "setPlaybackPause",
+                &luascriptfunctions::setPlaybackPause,
+                {},
+                "bool",
+                "Pauses or resumes the playback progression through keyframes"
+            },
+            {
+                "togglePlaybackPause",
+                &luascriptfunctions::togglePlaybackPause,
+                {},
+                "",
+                "Toggles the pause function, i.e. temporarily setting the delta time to 0"
+                " and restoring it afterwards"
+            },
+            {
+               "isPlayingBack",
+                & luascriptfunctions::isPlayingBack,
+                {},
+                "",
+                "Returns true if session recording is currently playing back a recording"
+            }
         }
     };
 }
diff --git a/src/interaction/sessionrecording_lua.inl b/src/interaction/sessionrecording_lua.inl
index fe457ce3df..520f074dd5 100644
--- a/src/interaction/sessionrecording_lua.inl
+++ b/src/interaction/sessionrecording_lua.inl
@@ -84,6 +84,20 @@ int startPlayback(lua_State* L, interaction::KeyframeTimeRef timeMode,
                   bool forceSimTimeAtStart)
 {
     using ghoul::lua::luaTypeToString;
+    const int nArguments = lua_gettop(L);
+    bool loop = false;
+
+    if (nArguments == 2) {
+        loop = lua_toboolean(L, 2) == 1;
+    }
+    else if (nArguments != 1) {
+        lua_settop(L, 0);
+        return luaL_error(
+            L,
+            "bad number of arguments, expected 1 or 2, got %i",
+            nArguments
+        );
+    }
 
     const std::string playbackFilePath = ghoul::lua::value<std::string>(
         L,
@@ -98,7 +112,8 @@ int startPlayback(lua_State* L, interaction::KeyframeTimeRef timeMode,
     global::sessionRecording->startPlayback(
         const_cast<std::string&>(playbackFilePath),
         timeMode,
-        forceSimTimeAtStart
+        forceSimTimeAtStart,
+        loop
     );
 
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
@@ -106,8 +121,8 @@ int startPlayback(lua_State* L, interaction::KeyframeTimeRef timeMode,
 }
 
 int startPlaybackDefault(lua_State* L) {
-    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::startPlaybackDefault");
     using interaction::KeyframeNavigator;
+    ghoul::lua::checkArgumentsAndThrow(L, {1, 2}, "lua::startPlaybackDefault");
     return startPlayback(L,
         interaction::KeyframeTimeRef::Relative_recordedStart, true);
 }
@@ -120,8 +135,8 @@ int startPlaybackApplicationTime(lua_State* L) {
 }
 
 int startPlaybackRecordedTime(lua_State* L) {
-    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::startPlaybackRecordedTime");
     using interaction::KeyframeNavigator;
+    ghoul::lua::checkArgumentsAndThrow(L, {1, 2}, "lua::startPlaybackRecordedTime");
     return startPlayback(L,
         interaction::KeyframeTimeRef::Relative_recordedStart, false);
 }
@@ -185,4 +200,63 @@ int fileFormatConversion(lua_State* L) {
     return 0;
 }
 
+int setPlaybackPause(lua_State* L) {
+    const int nArguments = lua_gettop(L);
+
+    if (nArguments == 1) {
+        const bool pause = lua_toboolean(L, 1) == 1;
+        global::sessionRecording->setPlaybackPause(pause);
+    }
+    else {
+        lua_settop(L, 0);
+        return luaL_error(
+            L,
+            "bad number of arguments, expected 1, got %i",
+            nArguments
+        );
+    }
+
+    lua_settop(L, 0);
+    ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
+    return 0;
+}
+
+int togglePlaybackPause(lua_State* L) {
+    const int nArguments = lua_gettop(L);
+
+    if (nArguments == 0) {
+        bool isPlaybackPaused = global::sessionRecording->isPlaybackPaused();
+        global::sessionRecording->setPlaybackPause(!isPlaybackPaused);
+    }
+    else {
+        lua_settop(L, 0);
+        return luaL_error(
+            L,
+            "bad number of arguments, expected 0, got %i",
+            nArguments
+        );
+    }
+
+    lua_settop(L, 0);
+    ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
+    return 0;
+}
+
+int isPlayingBack(lua_State* L) {
+    const int nArguments = lua_gettop(L);
+
+    if (nArguments != 0) {
+        lua_settop(L, 0);
+        return luaL_error(
+            L,
+            "bad number of arguments, expected 0, got %i",
+            nArguments
+        );
+    }
+
+    ghoul::lua::push(L, global::sessionRecording->isPlayingBack());
+    ghoul_assert(lua_gettop(L) == 1, "Incorrect number of items left on stack");
+    return 1;
+}
+
 } // namespace openspace::luascriptfunctions
diff --git a/src/interaction/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp
index 83eea9640c..2937ca9e44 100644
--- a/src/interaction/tasks/convertrecfileversiontask.cpp
+++ b/src/interaction/tasks/convertrecfileversiontask.cpp
@@ -29,6 +29,7 @@
 #include <openspace/engine/globals.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <filesystem>
 #include <iomanip>
 #include <ghoul/logging/logmanager.h>
 
@@ -56,8 +57,8 @@ ConvertRecFileVersionTask::ConvertRecFileVersionTask(const ghoul::Dictionary& di
         _inFilename = _inFilename.substr(idx + 1);
     }
 
-    ghoul_assert(FileSys.fileExists(_inFilePath), "The filename must exist");
-    if (!FileSys.fileExists(_inFilePath)) {
+    ghoul_assert(std::filesystem::is_regular_file(_inFilePath), "The file must exist");
+    if (!std::filesystem::is_regular_file(_inFilePath)) {
         LERROR(fmt::format("Failed to load session recording file: {}", _inFilePath));
     }
     else {
@@ -72,8 +73,10 @@ ConvertRecFileVersionTask::~ConvertRecFileVersionTask() {
 }
 
 std::string ConvertRecFileVersionTask::description() {
-    std::string description = "Convert file format of session recording file '"
-        + _inFilePath + "' to current version.";
+    std::string description = fmt::format(
+        "Convert file format of session recording file {} to current version",
+        _inFilePath
+    );
     return description;
 }
 
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index 3651d49868..505d7dc8ae 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -29,6 +29,7 @@
 #include <openspace/engine/globals.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <filesystem>
 #include <iomanip>
 #include <ghoul/logging/logmanager.h>
 
@@ -51,8 +52,8 @@ ConvertRecFormatTask::ConvertRecFormatTask(const ghoul::Dictionary& dictionary)
     _inFilePath = absPath(dictionary.value<std::string>(KeyInFilePath));
     _outFilePath = absPath(dictionary.value<std::string>(KeyOutFilePath));
 
-    ghoul_assert(FileSys.fileExists(_inFilePath), "The filename must exist");
-    if (!FileSys.fileExists(_inFilePath)) {
+    ghoul_assert(std::filesystem::is_regular_file(_inFilePath), "The file must exist");
+    if (!std::filesystem::is_regular_file(_inFilePath)) {
         LERROR(fmt::format("Failed to load session recording file: {}", _inFilePath));
     }
     else {
@@ -71,7 +72,8 @@ ConvertRecFormatTask::~ConvertRecFormatTask() {
 }
 
 std::string ConvertRecFormatTask::description() {
-    std::string description = "Convert session recording file '" + _inFilePath + "' ";
+    std::string description =
+        fmt::format("Convert session recording file {}", _inFilePath);
     if (_fileFormatType == SessionRecording::DataMode::Ascii) {
         description += "(ascii format) ";
     }
@@ -81,7 +83,7 @@ std::string ConvertRecFormatTask::description() {
     else {
         description += "(UNKNOWN format) ";
     }
-    description += "conversion to file '" + _outFilePath + "'.";
+    description += fmt::format("conversion to file {}", _outFilePath);
     return description;
 }
 
@@ -103,26 +105,30 @@ void ConvertRecFormatTask::convert() {
         expectedFileExtension_out = SessionRecording::FileExtensionBinary;
     }
 
-    if (!SessionRecording::hasFileExtension(_inFilePath, expectedFileExtension_in)) {
+    if (std::filesystem::path(_inFilePath).extension() != expectedFileExtension_in) {
         LWARNING(fmt::format(
-            "Input filename doesn't have expected {} format file extension",
-            currentFormat)
-        );
+            "Input filename doesn't have expected {} format file extension", currentFormat
+        ));
     }
-    if (SessionRecording::hasFileExtension(_outFilePath, expectedFileExtension_in)) {
+    if (std::filesystem::path(_outFilePath).extension() == expectedFileExtension_in) {
         LERROR(fmt::format(
             "Output filename has {} file extension, but is conversion from {}",
-            currentFormat,
-            currentFormat)
-        );
+            currentFormat, currentFormat
+        ));
         return;
     }
-    else if (!SessionRecording::hasFileExtension(_outFilePath, expectedFileExtension_out))
+    else if (std::filesystem::path(_outFilePath).extension() !=
+             expectedFileExtension_out)
     {
         _outFilePath += expectedFileExtension_out;
     }
 
     if (_fileFormatType == SessionRecording::DataMode::Ascii) {
+        _iFile.close();
+        _iFile.open(_inFilePath, std::ifstream::in);
+        //Throw out first line
+        std::string throw_out;
+        std::getline(_iFile, throw_out);
         _oFile.open(_outFilePath);
     }
     else if (_fileFormatType == SessionRecording::DataMode::Binary) {
@@ -142,7 +148,7 @@ void ConvertRecFormatTask::convert() {
         convertToAscii();
     }
     else {
-        //Add error output for file type not recognized
+        // Add error output for file type not recognized
         LERROR("Session recording file unrecognized format type.");
     }
 }
@@ -157,8 +163,9 @@ void ConvertRecFormatTask::determineFormatType() {
     if (line.substr(0, SessionRecording::FileHeaderTitle.length())
         != SessionRecording::FileHeaderTitle)
     {
-        LERROR(fmt::format("Session recording file {} does not have expected header.",
-            _inFilePath));
+        LERROR(fmt::format(
+            "Session recording file {} does not have expected header", _inFilePath
+        ));
     }
     else {
         //Read version string and throw it away (and also line feed character at end)
@@ -194,8 +201,7 @@ void ConvertRecFormatTask::convertToAscii() {
         // Check if have reached EOF
         if (!_iFile) {
             LINFO(fmt::format(
-                "Finished converting {} entries from file {}",
-                lineNum - 1, _inFilePath
+                "Finished converting {} entries from file {}", lineNum - 1, _inFilePath
             ));
             fileReadOk = false;
             break;
@@ -256,8 +262,7 @@ void ConvertRecFormatTask::convertToBinary() {
         std::string entryType;
         if (!(iss >> entryType)) {
             LERROR(fmt::format(
-                "Error reading entry type @ line {} of file {}",
-                lineNum, _inFilePath
+                "Error reading entry type @ line {} of file {}", lineNum, _inFilePath
             ));
             break;
         }
@@ -290,8 +295,7 @@ void ConvertRecFormatTask::convertToBinary() {
     }
     _oFile.close();
     LINFO(fmt::format(
-        "Finished converting {} entries from file {}",
-        lineNum, _inFilePath
+        "Finished converting {} entries from file {}", lineNum, _inFilePath
     ));
 }
 
diff --git a/src/mission/mission.cpp b/src/mission/mission.cpp
index feadaac081..fd469247e4 100644
--- a/src/mission/mission.cpp
+++ b/src/mission/mission.cpp
@@ -29,6 +29,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/lua/lua_helper.h>
 #include <algorithm>
+#include <filesystem>
 #include <optional>
 
 namespace {
@@ -55,9 +56,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation MissionPhase::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "core_mission_mission";
-    return doc;
+    return codegen::doc<Parameters>("core_mission_mission");
 }
 
 MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) {
@@ -165,7 +164,7 @@ void MissionPhase::phaseTrace(double time, Trace& trace, int maxDepth) const {
 Mission missionFromFile(const std::string& filename) {
     ghoul_assert(!filename.empty(), "filename must not be empty");
     ghoul_assert(!FileSys.containsToken(filename), "filename must not contain tokens");
-    ghoul_assert(FileSys.fileExists(filename), "filename must exist");
+    ghoul_assert(std::filesystem::is_regular_file(filename), "filename must exist");
 
     ghoul::Dictionary missionDict;
     ghoul::lua::loadDictionaryFromFile(filename, missionDict);
diff --git a/src/mission/missionmanager.cpp b/src/mission/missionmanager.cpp
index c84cbd8399..1ec94598b4 100644
--- a/src/mission/missionmanager.cpp
+++ b/src/mission/missionmanager.cpp
@@ -28,6 +28,7 @@
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/assert.h>
+#include <filesystem>
 
 #include "missionmanager_lua.inl"
 
@@ -58,7 +59,10 @@ bool MissionManager::hasCurrentMission() const {
 std::string MissionManager::loadMission(const std::string& filename) {
     ghoul_assert(!filename.empty(), "filename must not be empty");
     ghoul_assert(!FileSys.containsToken(filename), "filename must not contain tokens");
-    ghoul_assert(FileSys.fileExists(filename), "filename " + filename + " must exist");
+    ghoul_assert(
+        std::filesystem::is_regular_file(filename),
+        "filename " + filename + " must exist"
+    );
 
     // Changing the values might invalidate the _currentMission iterator
     std::string currentMission =  hasCurrentMission() ? _currentMission->first : "";
diff --git a/src/mission/missionmanager_lua.inl b/src/mission/missionmanager_lua.inl
index 5d9f3ea890..029737fd09 100644
--- a/src/mission/missionmanager_lua.inl
+++ b/src/mission/missionmanager_lua.inl
@@ -38,7 +38,9 @@ int loadMission(lua_State* L) {
         return ghoul::lua::luaError(L, "Filepath is empty");
     }
 
-    std::string name = global::missionManager->loadMission(absPath(missionFileName));
+    std::string name = global::missionManager->loadMission(
+        absPath(missionFileName).string()
+    );
     ghoul::lua::push(L, name);
 
     ghoul_assert(lua_gettop(L) == 1, "Incorrect number of items left on stack");
diff --git a/src/properties/list/doublelistproperty.cpp b/src/properties/list/doublelistproperty.cpp
index 7ec47234a8..2baee602c1 100644
--- a/src/properties/list/doublelistproperty.cpp
+++ b/src/properties/list/doublelistproperty.cpp
@@ -27,16 +27,30 @@
 #include <openspace/json.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/lua/lua_helper.h>
 #include <ghoul/misc/misc.h>
 
-namespace {
+namespace openspace::properties {
 
-constexpr const char* _loggerCat = "DoubleListProperty";
+DoubleListProperty::DoubleListProperty(Property::PropertyInfo info,
+                                       std::vector<double> values)
+    : ListProperty(std::move(info), std::move(values))
+{}
 
-std::vector<double> fromLuaConversion(lua_State* state, bool& success) {
+std::string DoubleListProperty::className() const {
+    return "DoubleListProperty";
+}
+
+int DoubleListProperty::typeLua() const {
+    return LUA_TTABLE;
+}
+
+std::vector<double> DoubleListProperty::fromLuaConversion(lua_State* state,
+                                                          bool& success) const
+{
     if (!lua_istable(state, -1)) {
         success = false;
-        LERROR("Conversion from Lua failed. The input was not a table");
+        LERRORC(className(), "Conversion from Lua failed. The input was not a table");
         return {};
     }
 
@@ -48,7 +62,8 @@ std::vector<double> fromLuaConversion(lua_State* state, bool& success) {
         }
         else {
             success = false;
-            LERROR(
+            LERRORC(
+                className(),
                 "Conversion from Lua failed. The input table contains non-number values"
             );
             return {};
@@ -59,46 +74,21 @@ std::vector<double> fromLuaConversion(lua_State* state, bool& success) {
     return result;
 }
 
-bool toLuaConversion(lua_State* state, std::vector<double> val) {
-    lua_createtable(state, static_cast<int>(val.size()), 0);
+void DoubleListProperty::toLuaConversion(lua_State* state) const {
+    lua_createtable(state, static_cast<int>(_value.size()), 0);
 
     int i = 1;
-    for (int v : val) {
-        lua_pushinteger(state, i);
-        lua_pushinteger(state, v);
+    for (double v : _value) {
+        ghoul::lua::push(state, i);
+        ghoul::lua::push(state, v);
         lua_settable(state, -3);
         ++i;
     }
-
-    return true;
 }
 
-bool toStringConversion(std::string& outValue, const std::vector<double>& inValue) {
-    nlohmann::json json(inValue);
-    outValue = json.dump();
-    return true;
+std::string DoubleListProperty::toStringConversion() const {
+    nlohmann::json json(_value);
+    return json.dump();
 }
 
-} // namespace
-
-namespace openspace::properties {
-
-DoubleListProperty::DoubleListProperty(Property::PropertyInfo info)
-    : ListProperty(std::move(info))
-{}
-
-DoubleListProperty::DoubleListProperty(Property::PropertyInfo info, std::vector<double> values)
-    : ListProperty(std::move(info), std::move(values))
-{}
-
-REGISTER_TEMPLATEPROPERTY_SOURCE(
-    DoubleListProperty,
-    std::vector<double>,
-    std::vector<double>(),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
 } // namespace openspace::properties
diff --git a/src/properties/list/intlistproperty.cpp b/src/properties/list/intlistproperty.cpp
index 9797b0925a..243f4f4eb6 100644
--- a/src/properties/list/intlistproperty.cpp
+++ b/src/properties/list/intlistproperty.cpp
@@ -27,16 +27,29 @@
 #include <openspace/json.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/lua/lua_helper.h>
 #include <ghoul/misc/misc.h>
 
-namespace {
+namespace openspace::properties {
 
-constexpr const char* _loggerCat = "IntListProperty";
+IntListProperty::IntListProperty(Property::PropertyInfo info, std::vector<int> values)
+    : ListProperty(std::move(info), std::move(values))
+{}
 
-std::vector<int> fromLuaConversion(lua_State* state, bool& success) {
+std::string IntListProperty::className() const {
+    return "IntListProperty";
+}
+
+int IntListProperty::typeLua() const {
+    return LUA_TTABLE;
+}
+
+std::vector<int> IntListProperty::fromLuaConversion(lua_State* state,
+                                                    bool& success) const
+{
     if (!lua_istable(state, -1)) {
         success = false;
-        LERROR("Conversion from Lua failed. The input was not a table");
+        LERRORC(className(), "Conversion from Lua failed. The input was not a table");
         return {};
     }
 
@@ -44,11 +57,12 @@ std::vector<int> fromLuaConversion(lua_State* state, bool& success) {
     lua_pushnil(state);
     while (lua_next(state, -2) != 0) {
         if (lua_isnumber(state, -1)) {
-            result.emplace_back(lua_tonumber(state, -1));
+            result.emplace_back(static_cast<int>(lua_tonumber(state, -1)));
         }
         else {
             success = false;
-            LERROR(
+            LERRORC(
+                className(),
                 "Conversion from Lua failed. The input table contains non-number values"
             );
             return {};
@@ -59,46 +73,21 @@ std::vector<int> fromLuaConversion(lua_State* state, bool& success) {
     return result;
 }
 
-bool toLuaConversion(lua_State* state, std::vector<int> val) {
-    lua_createtable(state, static_cast<int>(val.size()), 0);
+void IntListProperty::toLuaConversion(lua_State* state) const {
+    lua_createtable(state, static_cast<int>(_value.size()), 0);
 
     int i = 1;
-    for (const int& v : val) {
-        lua_pushinteger(state, i);
-        lua_pushinteger(state, v);
+    for (int v : _value) {
+        ghoul::lua::push(state, i);
+        ghoul::lua::push(state, v);
         lua_settable(state, -3);
         ++i;
     }
-
-    return true;
 }
 
-bool toStringConversion(std::string& outValue, const std::vector<int>& inValue) {
-    nlohmann::json json(inValue);
-    outValue = json.dump();
-    return true;
+std::string IntListProperty::toStringConversion() const {
+    nlohmann::json json(_value);
+    return json.dump();
 }
 
-} // namespace
-
-namespace openspace::properties {
-
-IntListProperty::IntListProperty(Property::PropertyInfo info)
-    : ListProperty(std::move(info))
-{}
-
-IntListProperty::IntListProperty(Property::PropertyInfo info, std::vector<int> values)
-    : ListProperty(std::move(info), std::move(values))
-{}
-
-REGISTER_TEMPLATEPROPERTY_SOURCE(
-    IntListProperty,
-    std::vector<int>,
-    std::vector<int>(),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
 } // namespace openspace::properties
diff --git a/src/properties/list/stringlistproperty.cpp b/src/properties/list/stringlistproperty.cpp
index d37e96552d..8fe753ee7d 100644
--- a/src/properties/list/stringlistproperty.cpp
+++ b/src/properties/list/stringlistproperty.cpp
@@ -27,18 +27,30 @@
 #include <openspace/json.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/lua/lua_helper.h>
 #include <ghoul/misc/misc.h>
 
-namespace {
-    constexpr const char* _loggerCat = "IntListProperty";
-} // namespace
+namespace openspace::properties {
 
-namespace {
+StringListProperty::StringListProperty(Property::PropertyInfo info,
+                                       std::vector<std::string> values)
+    : ListProperty(std::move(info), std::move(values))
+{}
 
-std::vector<std::string> fromLuaConversion(lua_State* state, bool& success) {
+std::string StringListProperty::className() const {
+    return "StringListProperty";
+}
+
+int StringListProperty::typeLua() const {
+    return LUA_TTABLE;
+}
+
+std::vector<std::string> StringListProperty::fromLuaConversion(lua_State* state,
+                                                               bool& success) const
+{
     if (!lua_istable(state, -1)) {
         success = false;
-        LERROR("Conversion from Lua failed. The input was not a table");
+        LERRORC(className(), "Conversion from Lua failed. The input was not a table");
         return {};
     }
 
@@ -58,47 +70,21 @@ std::vector<std::string> fromLuaConversion(lua_State* state, bool& success) {
     return result;
 }
 
-bool toLuaConversion(lua_State* state, std::vector<std::string> val) {
-    lua_createtable(state, static_cast<int>(val.size()), 0);
+void StringListProperty::toLuaConversion(lua_State* state) const {
+    lua_createtable(state, static_cast<int>(_value.size()), 0);
 
     int i = 1;
-    for (const std::string& v : val) {
-        lua_pushinteger(state, i);
-        lua_pushstring(state, v.c_str());
+    for (const std::string& v : _value) {
+        ghoul::lua::push(state, i);
+        ghoul::lua::push(state, v.c_str());
         lua_settable(state, -3);
         ++i;
     }
-
-    return true;
 }
 
-bool toStringConversion(std::string& outValue, const std::vector<std::string>& inValue) {
-    nlohmann::json json(inValue);
-    outValue = json.dump();
-    return true;
+std::string StringListProperty::toStringConversion() const {
+    nlohmann::json json(_value);
+    return json.dump();
 }
 
-} // namespace
-
-namespace openspace::properties {
-
-StringListProperty::StringListProperty(Property::PropertyInfo info)
-    : ListProperty(std::move(info))
-{}
-
-StringListProperty::StringListProperty(Property::PropertyInfo info,
-                                       std::vector<std::string> values)
-    : ListProperty(std::move(info), std::move(values))
-{}
-
-REGISTER_TEMPLATEPROPERTY_SOURCE(
-    StringListProperty,
-    std::vector<std::string>,
-    std::vector<std::string>(),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
 } // namespace openspace::properties
diff --git a/src/properties/matrix/dmat2property.cpp b/src/properties/matrix/dmat2property.cpp
index 289b224aee..130347e582 100644
--- a/src/properties/matrix/dmat2property.cpp
+++ b/src/properties/matrix/dmat2property.cpp
@@ -24,84 +24,33 @@
 
 #include <openspace/properties/matrix/dmat2property.h>
 
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::dmat2x2 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dmat2x2 result;
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat2x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x2::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::dmat2x2(0.0);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::dmat2x2(0.0);
-            }
-            else {
-                result[i][j] = lua_tonumber(state, -1);
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dmat2x2 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat2x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x2::col_type::length(); ++j) {
-            lua_pushnumber(state, value[i][j]);
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dmat2x2 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::dmat2x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x2::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-using nl = std::numeric_limits<double>;
+DMat2Property::DMat2Property(Property::PropertyInfo info, glm::dmat2x2 value,
+                             glm::dmat2x2 minValue, glm::dmat2x2 maxValue,
+                             glm::dmat2x2 stepValue)
+    : NumericalProperty<glm::dmat2x2>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DMat2Property,
-    glm::dmat2x2,
-    glm::dmat2x2(0.0),
-    glm::dmat2x2(nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest()),
-    glm::dmat2x2(nl::max(), nl::max(), nl::max(), nl::max()),
-    glm::dmat2x2(0.01, 0.01, 0.01, 0.01),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+std::string DMat2Property::className() const {
+    return "DMat2Property";
+}
+
+int DMat2Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::dmat2x2 DMat2Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::dmat2x2>(state, success);
+}
 
 }  // namespace openspace::properties
diff --git a/src/properties/matrix/dmat2x3property.cpp b/src/properties/matrix/dmat2x3property.cpp
deleted file mode 100644
index ee4aff65fe..0000000000
--- a/src/properties/matrix/dmat2x3property.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/dmat2x3property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::dmat2x3 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dmat2x3 result;
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat2x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x3::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::dmat2x3(0.0);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::dmat2x3(0.0);
-            }
-            else {
-                result[i][j] = lua_tonumber(state, -1);
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dmat2x3 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat2x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x3::col_type::length(); ++j) {
-            lua_pushnumber(state, value[i][j]);
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dmat2x3 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::dmat2x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x3::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<double>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DMat2x3Property,
-    glm::dmat2x3,
-    glm::dmat2x3(0.0),
-    glm::dmat2x3(
-        nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest()
-    ),
-    glm::dmat2x3(
-        nl::max(), nl::max(),
-        nl::max(), nl::max(),
-        nl::max(), nl::max()
-    ),
-    glm::dmat2x3(0.01, 0.01, 0.01, 0.01, 0.01, 0.01),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/matrix/dmat2x4property.cpp b/src/properties/matrix/dmat2x4property.cpp
deleted file mode 100644
index b2d911cd4f..0000000000
--- a/src/properties/matrix/dmat2x4property.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/dmat2x4property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::dmat2x4 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dmat2x4 result;
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat2x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x4::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::dmat2x4(0.0);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::dmat2x4(0.0);
-            }
-            else {
-                result[i][j] = lua_tonumber(state, -1);
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dmat2x4 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat2x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x4::col_type::length(); ++j) {
-            lua_pushnumber(state, value[i][j]);
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dmat2x4 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::dmat2x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x4::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<double>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DMat2x4Property,
-    glm::dmat2x4,
-    glm::dmat2x4(0.0),
-    glm::dmat2x4(
-        nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest()
-    ),
-    glm::dmat2x4(
-        nl::max(), nl::max(),
-        nl::max(), nl::max(),
-        nl::max(), nl::max(),
-        nl::max(), nl::max()
-    ),
-    glm::dmat2x4(0.01, 0.01, 0.01, 0.01, 0.01, 0.01, 0.01, 0.01),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/matrix/dmat3property.cpp b/src/properties/matrix/dmat3property.cpp
index bd151314fa..b09c3f31fe 100644
--- a/src/properties/matrix/dmat3property.cpp
+++ b/src/properties/matrix/dmat3property.cpp
@@ -24,97 +24,33 @@
 
 #include <openspace/properties/matrix/dmat3property.h>
 
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::dmat3x3 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dmat3x3 result;
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat3x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x3::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::dmat3x3(0.0);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::dmat3x3(0.0);
-            }
-            else {
-                result[i][j] = lua_tonumber(state, -1);
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dmat3x3 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat3x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x3::col_type::length(); ++j) {
-            lua_pushnumber(state, value[i][j]);
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dmat3x3 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::dmat3x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat2x3::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-
-} // namespace
+#include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-using nl = std::numeric_limits<double>;
+DMat3Property::DMat3Property(Property::PropertyInfo info, glm::dmat3x3 value,
+                             glm::dmat3x3 minValue, glm::dmat3x3 maxValue,
+                             glm::dmat3x3 stepValue)
+    : NumericalProperty<glm::dmat3x3>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DMat3Property,
-    glm::dmat3x3,
-    glm::dmat3x3(0.0),
-    glm::dmat3x3(
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::dmat3x3(
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max()
-    ),
-    glm::dmat3x3(
-        0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+std::string DMat3Property::className() const {
+    return "DMat3Property";
+}
+
+int DMat3Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::dmat3x3 DMat3Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::mat3x3>(state, success);
+}
 
 }  // namespace openspace::properties
diff --git a/src/properties/matrix/dmat3x2property.cpp b/src/properties/matrix/dmat3x2property.cpp
deleted file mode 100644
index c9396b997f..0000000000
--- a/src/properties/matrix/dmat3x2property.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/dmat3x2property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::dmat3x2 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dmat3x2 result;
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat3x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat3x2::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::dmat3x2(0.0);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::dmat3x2(0.0);
-            }
-            else {
-                result[i][j] = lua_tonumber(state, -1);
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dmat3x2 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat3x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat3x2::col_type::length(); ++j) {
-            lua_pushnumber(state, value[i][j]);
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dmat3x2 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::dmat3x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat3x2::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<double>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DMat3x2Property,
-    glm::dmat3x2,
-    glm::dmat3x2(0.0),
-    glm::dmat3x2(
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::dmat3x2(
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max()
-    ),
-    glm::dmat3x2(
-        0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/matrix/dmat3x4property.cpp b/src/properties/matrix/dmat3x4property.cpp
deleted file mode 100644
index d09a9380de..0000000000
--- a/src/properties/matrix/dmat3x4property.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/dmat3x4property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::dmat3x4 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dmat3x4 result;
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat3x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat3x4::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::dmat3x4(0.0);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::dmat3x4(0.0);
-            }
-            else {
-                result[i][j] = lua_tonumber(state, -1);
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dmat3x4 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat3x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat3x4::col_type::length(); ++j) {
-            lua_pushnumber(state, value[i][j]);
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dmat3x4 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::dmat3x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat3x4::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<double>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DMat3x4Property,
-    glm::dmat3x4,
-    glm::dmat3x4(0.0),
-    glm::dmat3x4(
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::dmat3x4(
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max()
-    ),
-    glm::dmat3x4(
-        0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/matrix/dmat4property.cpp b/src/properties/matrix/dmat4property.cpp
index 7056ce12ea..74c9dbaa9c 100644
--- a/src/properties/matrix/dmat4property.cpp
+++ b/src/properties/matrix/dmat4property.cpp
@@ -24,99 +24,33 @@
 
 #include <openspace/properties/matrix/dmat4property.h>
 
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::dmat4x4 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dmat4x4 result;
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat4x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat4x4::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::dmat4x4(0.0);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::dmat4x4(0.0);
-            }
-            else {
-                result[i][j] = lua_tonumber(state, -1);
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dmat4x4 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat4x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat4x4::col_type::length(); ++j) {
-            lua_pushnumber(state, value[i][j]);
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dmat4x4 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::dmat4x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat4x4::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-using nl = std::numeric_limits<double>;
+DMat4Property::DMat4Property(Property::PropertyInfo info, glm::dmat4x4 value,
+                             glm::dmat4x4 minValue, glm::dmat4x4 maxValue,
+                             glm::dmat4x4 stepValue)
+    : NumericalProperty<glm::dmat4x4>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DMat4Property,
-    glm::dmat4x4,
-    glm::dmat4x4(0.0),
-    glm::dmat4x4(
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::dmat4x4(
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max()
-    ),
-    glm::dmat4x4(
-        0.01, 0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01, 0.01
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+std::string DMat4Property::className() const {
+    return "DMat4Property";
+}
+
+int DMat4Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::dmat4x4 DMat4Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::dmat4x4>(state, success);
+}
 
 }  // namespace openspace::properties
diff --git a/src/properties/matrix/dmat4x2property.cpp b/src/properties/matrix/dmat4x2property.cpp
deleted file mode 100644
index 6c20123cbf..0000000000
--- a/src/properties/matrix/dmat4x2property.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/dmat4x2property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::dmat4x2 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dmat4x2 result;
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat4x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat4x2::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::dmat4x2(0.0);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::dmat4x2(0.0);
-            }
-            else {
-                result[i][j] = lua_tonumber(state, -1);
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dmat4x2 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat4x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat4x2::col_type::length(); ++j) {
-            lua_pushnumber(state, value[i][j]);
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dmat4x2 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::dmat4x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat4x2::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-}  // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<double>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DMat4x2Property,
-    glm::dmat4x2,
-    glm::dmat4x2(0.0),
-    glm::dmat4x2(
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::dmat4x2(
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max()
-    ),
-    glm::dmat4x2(
-        0.01, 0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01, 0.01
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/matrix/dmat4x3property.cpp b/src/properties/matrix/dmat4x3property.cpp
deleted file mode 100644
index f63b80a109..0000000000
--- a/src/properties/matrix/dmat4x3property.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/dmat4x3property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::dmat4x3 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dmat4x3 result;
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat4x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat4x3::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::dmat4x3(0.0);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::dmat4x3(0.0);
-            }
-            else {
-                result[i][j] = lua_tonumber(state, -1);
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dmat4x3 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::dmat4x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat4x3::col_type::length(); ++j) {
-            lua_pushnumber(state, value[i][j]);
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dmat4x3 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::dmat4x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::dmat4x3::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<double>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DMat4x3Property,
-    glm::dmat4x3,
-    glm::dmat4x3(0.0),
-    glm::dmat4x3(
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::dmat4x3(
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max()
-    ),
-    glm::dmat4x3(
-        0.01, 0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01, 0.01,
-        0.01, 0.01, 0.01, 0.01
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/matrix/mat2property.cpp b/src/properties/matrix/mat2property.cpp
index c5d23ba3fd..5fe3f35ca4 100644
--- a/src/properties/matrix/mat2property.cpp
+++ b/src/properties/matrix/mat2property.cpp
@@ -24,95 +24,33 @@
 
 #include <openspace/properties/matrix/mat2property.h>
 
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::mat2x2 fromLuaConversion(lua_State* state, bool& success) {
-    glm::mat2x2 result = glm::mat2x2(1.f);
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat2x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat2x2::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::mat2x2(1.f);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::mat2x2(1.f);
-            }
-            else {
-                result[i][j] = static_cast<glm::mat2x2::value_type>(
-                    lua_tonumber(state, -1)
-                );
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::mat2x2 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat2x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat2x2::col_type::length(); ++j) {
-            lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::mat2x2 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::mat2x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat2x2::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-using nl = std::numeric_limits<float>;
+Mat2Property::Mat2Property(Property::PropertyInfo info, glm::mat2x2 value,
+                           glm::mat2x2 minValue, glm::mat2x2 maxValue,
+                           glm::mat2x2 stepValue)
+    : NumericalProperty<glm::mat2x2>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Mat2Property,
-    glm::mat2x2,
-    glm::mat2x2(1.f),
-    glm::mat2x2(
-        nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest()
-    ),
-    glm::mat2x2(
-        nl::max(), nl::max(),
-        nl::max(), nl::max()
-    ),
-    glm::mat2x2(
-        0.01f, 0.01f,
-        0.01f, 0.01f
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+std::string Mat2Property::className() const {
+    return "Mat2Property";
+}
+
+int Mat2Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::mat2x2 Mat2Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::mat2x2>(state, success);
+}
 
 }  // namespace openspace::properties
diff --git a/src/properties/matrix/mat2x3property.cpp b/src/properties/matrix/mat2x3property.cpp
deleted file mode 100644
index c5d62e1bb1..0000000000
--- a/src/properties/matrix/mat2x3property.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/mat2x3property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-using std::numeric_limits;
-
-namespace {
-
-glm::mat2x3 fromLuaConversion(lua_State* state, bool& success) {
-    glm::mat2x3 result = glm::mat2x3(1.f);
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat2x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat2x3::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::mat2x3(1.f);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::mat2x3(1.f);
-            }
-            else {
-                result[i][j]
-                    = static_cast<glm::mat2x3::value_type>(lua_tonumber(state, -1));
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::mat2x3 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat2x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat2x3::col_type::length(); ++j) {
-            lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::mat2x3 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::mat2x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat2x3::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<float>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Mat2x3Property,
-    glm::mat2x3,
-    glm::mat2x3(1.f),
-    glm::mat2x3(
-        nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest()
-    ),
-    glm::mat2x3(
-        nl::max(), nl::max(),
-        nl::max(), nl::max(),
-        nl::max(), nl::max()
-    ),
-    glm::mat2x3(
-        0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/matrix/mat2x4property.cpp b/src/properties/matrix/mat2x4property.cpp
deleted file mode 100644
index eb8b9822e0..0000000000
--- a/src/properties/matrix/mat2x4property.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/mat2x4property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::mat2x4 fromLuaConversion(lua_State* state, bool& success) {
-    glm::mat2x4 result = glm::mat2x4(1.f);
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat2x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat2x4::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::mat2x4(1.f);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::mat2x4(1.f);
-            }
-            else {
-                result[i][j]
-                    = static_cast<glm::mat2x4::value_type>(lua_tonumber(state, -1));
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::mat2x4 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat2x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat2x4::col_type::length(); ++j) {
-            lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::mat2x4 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::mat2x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat2x4::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<float>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Mat2x4Property,
-    glm::mat2x4,
-    glm::mat2x4(1.f),
-    glm::mat2x4(
-        nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest()
-    ),
-    glm::mat2x4(
-        nl::max(), nl::max(),
-        nl::max(), nl::max(),
-        nl::max(), nl::max(),
-        nl::max(), nl::max()
-    ),
-    glm::mat2x4(
-        0.01f, 0.01f,
-        0.01f, 0.01f,
-        0.01f, 0.01f,
-        0.01f, 0.01f
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/matrix/mat3property.cpp b/src/properties/matrix/mat3property.cpp
index 882e984892..8abb81811a 100644
--- a/src/properties/matrix/mat3property.cpp
+++ b/src/properties/matrix/mat3property.cpp
@@ -24,97 +24,33 @@
 
 #include <openspace/properties/matrix/mat3property.h>
 
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::mat3x3 fromLuaConversion(lua_State* state, bool& success) {
-    glm::mat3x3 result = glm::mat3x3(1.f);
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat3x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat3x3::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::mat3x3(1.f);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::mat3x3(1.f);
-            }
-            else {
-                result[i][j]
-                        = static_cast<glm::mat3x3::value_type>(lua_tonumber(state, -1));
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::mat3x3 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat3x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat3x3::col_type::length(); ++j) {
-            lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::mat3x3 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::mat3x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat3x3::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-using nl = std::numeric_limits<float>;
+Mat3Property::Mat3Property(Property::PropertyInfo info, glm::mat3x3 value,
+                           glm::mat3x3 minValue, glm::mat3x3 maxValue,
+                           glm::mat3x3 stepValue)
+    : NumericalProperty<glm::mat3x3>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Mat3Property,
-    glm::mat3x3,
-    glm::mat3x3(1.f),
-    glm::mat3x3(
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::mat3x3(
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max()
-    ),
-    glm::mat3x3(
-        0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+std::string Mat3Property::className() const {
+    return "Mat3Property";
+}
+
+int Mat3Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::mat3x3 Mat3Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::mat3x3>(state, success);
+}
 
 }  // namespace openspace::properties
diff --git a/src/properties/matrix/mat3x2property.cpp b/src/properties/matrix/mat3x2property.cpp
deleted file mode 100644
index 7540181d7e..0000000000
--- a/src/properties/matrix/mat3x2property.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/mat3x2property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::mat3x2 fromLuaConversion(lua_State* state, bool& success) {
-    glm::mat3x2 result = glm::mat3x2(1.f);
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat3x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat3x2::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::mat3x2(0.f);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::mat3x2(0.f);
-            }
-            else {
-                result[i][j]
-                        = static_cast<glm::mat3x2::value_type>(lua_tonumber(state, -1));
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::mat3x2 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat3x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat3x2::col_type::length(); ++j) {
-            lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::mat3x2 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::mat3x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat3x2::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<float>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Mat3x2Property,
-    glm::mat3x2,
-    glm::mat3x2(1.f),
-    glm::mat3x2(
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::mat3x2(
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max()
-    ),
-    glm::mat3x2(
-        0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/matrix/mat3x4property.cpp b/src/properties/matrix/mat3x4property.cpp
deleted file mode 100644
index 5b9f7240ef..0000000000
--- a/src/properties/matrix/mat3x4property.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/mat3x4property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::mat3x4 fromLuaConversion(lua_State* state, bool& success) {
-    glm::mat3x4 result = glm::mat3x4(1.f);
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat3x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat3x4::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::mat3x4(1.f);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::mat3x4(1.f);
-            }
-            else {
-                result[i][j]
-                        = static_cast<glm::mat3x4::value_type>(lua_tonumber(state, -1));
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::mat3x4 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat3x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat3x4::col_type::length(); ++j) {
-            lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::mat3x4 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::mat3x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat3x4::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<float>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Mat3x4Property,
-    glm::mat3x4,
-    glm::mat3x4(1.f),
-    glm::mat3x4(
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::mat3x4(
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max()
-    ),
-    glm::mat3x4(
-        0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/matrix/mat4property.cpp b/src/properties/matrix/mat4property.cpp
index b7847e93a9..a4c17513e8 100644
--- a/src/properties/matrix/mat4property.cpp
+++ b/src/properties/matrix/mat4property.cpp
@@ -24,102 +24,33 @@
 
 #include <openspace/properties/matrix/mat4property.h>
 
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-using std::numeric_limits;
-
-namespace {
-
-glm::mat4x4 fromLuaConversion(lua_State* state, bool& success) {
-    glm::mat4x4 result = glm::mat4x4(1.f);
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat4x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat4x4::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::mat4x4(1.f);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::mat4x4(1.f);
-            }
-            else {
-                result[i][j]
-                        = static_cast<glm::mat4x4::value_type>(lua_tonumber(state, -1));
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::mat4x4 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat4x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat4x4::col_type::length(); ++j) {
-            lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::mat4x4 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::mat4x4::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat4x4::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-using nl = std::numeric_limits<float>;
+Mat4Property::Mat4Property(Property::PropertyInfo info, glm::mat4x4 value,
+                           glm::mat4x4 minValue, glm::mat4x4 maxValue,
+                           glm::mat4x4 stepValue)
+    : NumericalProperty<glm::mat4x4>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Mat4Property,
-    glm::mat4x4,
-    glm::mat4x4(1.f),
-    glm::mat4x4(
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::mat4x4(
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max()
-    ),
-    glm::mat4x4(
-        0.01f, 0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f, 0.01f
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+std::string Mat4Property::className() const {
+    return "Mat4Property";
+}
+
+int Mat4Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::mat4x4 Mat4Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::mat4x4>(state, success);
+}
 
 }  // namespace openspace::properties
diff --git a/src/properties/matrix/mat4x2property.cpp b/src/properties/matrix/mat4x2property.cpp
deleted file mode 100644
index 372ff5a307..0000000000
--- a/src/properties/matrix/mat4x2property.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/mat4x2property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::mat4x2 fromLuaConversion(lua_State* state, bool& success) {
-    glm::mat4x2 result = glm::mat4x2(1.f);
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat4x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat4x2::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::mat4x2(1.f);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::mat4x2(1.f);
-            }
-            else {
-                result[i][j]
-                        = static_cast<glm::mat4x2::value_type>(lua_tonumber(state, -1));
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::mat4x2 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat4x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat4x2::col_type::length(); ++j) {
-            lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::mat4x2 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::mat4x2::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat4x2::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<float>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Mat4x2Property,
-    glm::mat4x2,
-    glm::mat4x2(1.f),
-    glm::mat4x2(
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::mat4x2(
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max()
-    ),
-    glm::mat4x2(
-        0.01f, 0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f, 0.01f
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/matrix/mat4x3property.cpp b/src/properties/matrix/mat4x3property.cpp
deleted file mode 100644
index 26b2504ca6..0000000000
--- a/src/properties/matrix/mat4x3property.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/matrix/mat4x3property.h>
-
-#include <ghoul/misc/misc.h>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
-namespace {
-
-glm::mat4x3 fromLuaConversion(lua_State* state, bool& success) {
-    glm::mat4x3 result = glm::mat4x3(1.f);
-    lua_pushnil(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat4x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat4x3::col_type::length(); ++j) {
-            int hasNext = lua_next(state, -2);
-            if (hasNext != 1) {
-                success = false;
-                return glm::mat4x3(1.f);
-            }
-            if (lua_isnumber(state, -1) != 1) {
-                success = false;
-                return glm::mat4x3(1.f);
-            }
-            else {
-                result[i][j]
-                        = static_cast<glm::mat4x3::value_type>(lua_tonumber(state, -1));
-                lua_pop(state, 1);
-                ++number;
-            }
-        }
-    }
-    // The last accessor argument and the table are still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::mat4x3 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < glm::mat4x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat4x3::col_type::length(); ++j) {
-            lua_pushnumber(state, static_cast<lua_Number>(value[i][j]));
-            lua_rawseti(state, -2, number);
-            ++number;
-        }
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::mat4x3 inValue) {
-    outValue = "[";
-    for (glm::length_t i = 0; i < glm::mat4x3::row_type::length(); ++i) {
-        for (glm::length_t j = 0; j < glm::mat4x3::col_type::length(); ++j) {
-            outValue += std::to_string(inValue[i][j]) + ",";
-        }
-    }
-    outValue.pop_back();
-    outValue += "]";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-using nl = std::numeric_limits<float>;
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Mat4x3Property,
-    glm::mat4x3,
-    glm::mat4x3(1.f),
-    glm::mat4x3(
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest(),
-        nl::lowest(), nl::lowest(), nl::lowest(), nl::lowest()
-    ),
-    glm::mat4x3(
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max(),
-        nl::max(), nl::max(), nl::max(), nl::max()
-    ),
-    glm::mat4x3(
-        0.01f, 0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f, 0.01f,
-        0.01f, 0.01f, 0.01f, 0.01f
-    ),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-}  // namespace openspace::properties
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index 5985da3dc6..342e4c8fb5 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -23,6 +23,7 @@
  ****************************************************************************************/
 
 #include <openspace/properties/property.h>
+
 #include <openspace/properties/propertyowner.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
@@ -34,7 +35,6 @@ namespace {
     constexpr const char* MetaDataKeyReadOnly = "isReadOnly";
     constexpr const char* MetaDataKeyViewOptions = "ViewOptions";
     constexpr const char* MetaDataKeyVisibility = "Visibility";
-
 } // namespace
 
 namespace openspace::properties {
@@ -43,7 +43,7 @@ Property::OnChangeHandle Property::OnChangeHandleAll =
                                                std::numeric_limits<OnChangeHandle>::max();
 
 const char* Property::ViewOptions::Color = "Color";
-const char* Property::ViewOptions::Logarithmic = "Logarithmic";
+const char* Property::ViewOptions::MinMaxRange = "MinMaxRange";
 
 const char* Property::IdentifierKey = "Identifier";
 const char* Property::NameKey = "Name";
@@ -54,7 +54,6 @@ const char* Property::MetaDataKey = "MetaData";
 const char* Property::AdditionalDataKey = "AdditionalData";
 
 
-
 std::string sanitizeString(const std::string& s) {
     std::string result;
 
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index 6864b7c0b5..94c716e826 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -26,6 +26,7 @@
 
 #include <openspace/properties/property.h>
 #include <openspace/scene/scene.h>
+#include <openspace/util/json_helper.h>
 #include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
@@ -36,32 +37,6 @@
 namespace {
     constexpr const char* _loggerCat = "PropertyOwner";
 
-    std::string escapedJson(const std::string& text) {
-        std::string jsonString;
-        for (const char& c : text) {
-            switch (c) {
-                case '\t':
-                    jsonString += "\\t"; // Replace tab with \t.
-                    break;
-                case '"':
-                    jsonString += "\\\""; // Replace " with \".
-                    break;
-                case '\\':
-                    jsonString += "\\\\"; // Replace \ with \\.
-                    break;
-                case '\n':
-                    jsonString += "\\\\n"; // Replace newline with \n.
-                    break;
-                case '\r':
-                    jsonString += "\\r"; // Replace carriage return with \r.
-                    break;
-                default:
-                    jsonString += c;
-            }
-        }
-        return jsonString;
-    }
-
     void createJson(openspace::properties::PropertyOwner* owner, std::vector<char>& buf) {
         ZoneScoped
 
diff --git a/src/properties/scalar/boolproperty.cpp b/src/properties/scalar/boolproperty.cpp
index 439d3800f3..913a13827c 100644
--- a/src/properties/scalar/boolproperty.cpp
+++ b/src/properties/scalar/boolproperty.cpp
@@ -25,44 +25,33 @@
 #include <openspace/properties/scalar/boolproperty.h>
 
 #include <ghoul/lua/ghoul_lua.h>
-
-#include <limits>
-#include <sstream>
-
-namespace {
-
-bool fromLuaConversion(lua_State* state, bool& success) {
-    success = (lua_isboolean(state, -1) == 1);
-    if (success) {
-        return lua_toboolean(state, -1) == 1;
-    }
-    else {
-        return false;
-    }
-}
-
-bool toLuaConversion(lua_State* state, bool value) {
-    lua_pushboolean(state, value);
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, bool inValue) {
-    outValue = inValue ? "true" : "false";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_TEMPLATEPROPERTY_SOURCE(
-    BoolProperty,
-    bool,
-    false,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TBOOLEAN
-)
+BoolProperty::BoolProperty(Property::PropertyInfo info, bool value)
+    : TemplateProperty<bool>(std::move(info), value)
+{}
+
+std::string BoolProperty::className() const {
+    return "BoolProperty";
+}
+
+int BoolProperty::typeLua() const {
+    return LUA_TBOOLEAN;
+}
+
+bool BoolProperty::fromLuaConversion(lua_State* state, bool& success) const {
+    success = (lua_isboolean(state, -1) == 1);
+    return success ? (lua_toboolean(state, -1) == 1) : false;
+}
+
+void BoolProperty::toLuaConversion(lua_State* state) const {
+    ghoul::lua::push(state, _value);
+}
+
+std::string BoolProperty::toStringConversion() const {
+    return _value ? "true" : "false";
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/scalar/charproperty.cpp b/src/properties/scalar/charproperty.cpp
deleted file mode 100644
index f6cff94313..0000000000
--- a/src/properties/scalar/charproperty.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/scalar/charproperty.h>
-
-#include <ghoul/lua/ghoul_lua.h>
-
-#include <limits>
-#include <sstream>
-
-namespace {
-
-char fromLuaConversion(lua_State* state, bool& success) {
-    success = (lua_isnumber(state, -1) == 1);
-    if (success) {
-        char val = static_cast<char>(lua_tonumber(state, -1));
-        return val;
-    }
-    else {
-        return char(0);
-    }
-}
-
-bool toLuaConversion(lua_State* state, char value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, char inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    CharProperty,
-    char,
-    char(0),
-    std::numeric_limits<char>::lowest(),
-    std::numeric_limits<char>::max(),
-    char(1),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
-} // namespace openspace::properties
diff --git a/src/properties/scalar/doubleproperty.cpp b/src/properties/scalar/doubleproperty.cpp
index 6b1019350f..ecc7c74895 100644
--- a/src/properties/scalar/doubleproperty.cpp
+++ b/src/properties/scalar/doubleproperty.cpp
@@ -26,12 +26,22 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 
-#include <limits>
-#include <sstream>
+namespace openspace::properties {
 
-namespace {
+DoubleProperty::DoubleProperty(Property::PropertyInfo info, double value,
+                               double minValue, double maxValue, double stepValue)
+    : NumericalProperty<double>(std::move(info), value, minValue, maxValue, stepValue)
+{}
 
-double fromLuaConversion(lua_State* state, bool& success) {
+std::string DoubleProperty::className() const {
+    return "DoubleProperty";
+}
+
+int DoubleProperty::typeLua() const {
+    return LUA_TNUMBER;
+}
+
+double DoubleProperty::fromLuaConversion(lua_State* state, bool& success) const {
     success = (lua_isnumber(state, -1) == 1);
     if (success) {
         double val = lua_tonumber(state, -1);
@@ -42,31 +52,4 @@ double fromLuaConversion(lua_State* state, bool& success) {
     }
 }
 
-bool toLuaConversion(lua_State* state, double value) {
-    lua_pushnumber(state, value);
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, double inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DoubleProperty,
-    double,
-    0.0,
-    std::numeric_limits<double>::lowest(),
-    std::numeric_limits<double>::max(),
-    0.01,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
 } // namespace openspace::properties
diff --git a/src/properties/scalar/floatproperty.cpp b/src/properties/scalar/floatproperty.cpp
index a0ca445300..b7804815d3 100644
--- a/src/properties/scalar/floatproperty.cpp
+++ b/src/properties/scalar/floatproperty.cpp
@@ -26,12 +26,22 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 
-#include <limits>
-#include <sstream>
+namespace openspace::properties {
 
-namespace {
+FloatProperty::FloatProperty(Property::PropertyInfo info, float value,
+                             float minValue, float maxValue, float stepValue)
+    : NumericalProperty<float>(std::move(info), value, minValue, maxValue, stepValue)
+{}
 
-float fromLuaConversion(lua_State* state, bool& success) {
+std::string FloatProperty::className() const {
+    return "FloatProperty";
+}
+
+int FloatProperty::typeLua() const {
+    return LUA_TNUMBER;
+}
+
+float FloatProperty::fromLuaConversion(lua_State* state, bool& success) const {
     success = (lua_isnumber(state, -1) == 1);
     if (success) {
         float val = static_cast<float>(lua_tonumber(state, -1));
@@ -42,31 +52,4 @@ float fromLuaConversion(lua_State* state, bool& success) {
     }
 }
 
-bool toLuaConversion(lua_State* state, float value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, float inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    FloatProperty,
-    float,
-    0.f,
-    std::numeric_limits<float>::lowest(),
-    std::numeric_limits<float>::max(),
-    0.01f,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
 } // namespace openspace::properties
diff --git a/src/properties/scalar/intproperty.cpp b/src/properties/scalar/intproperty.cpp
index 0a3b134e1b..b9bb055e13 100644
--- a/src/properties/scalar/intproperty.cpp
+++ b/src/properties/scalar/intproperty.cpp
@@ -26,12 +26,22 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 
-#include <limits>
-#include <sstream>
+namespace openspace::properties {
 
-namespace {
+IntProperty::IntProperty(Property::PropertyInfo info, int value,
+                         int minValue, int maxValue, int stepValue)
+    : NumericalProperty<int>(std::move(info), value, minValue, maxValue, stepValue)
+{}
 
-int fromLuaConversion(lua_State* state, bool& success) {
+std::string IntProperty::className() const {
+    return "IntProperty";
+}
+
+int IntProperty::typeLua() const {
+    return LUA_TNUMBER;
+}
+
+int IntProperty::fromLuaConversion(lua_State* state, bool& success) const {
     success = (lua_isnumber(state, -1) == 1);
     if (success) {
         int val = static_cast<int>(lua_tonumber(state, -1));
@@ -42,31 +52,4 @@ int fromLuaConversion(lua_State* state, bool& success) {
     }
 }
 
-bool toLuaConversion(lua_State* state, int value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, int inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    IntProperty,
-    int,
-    0,
-    std::numeric_limits<int>::lowest(),
-    std::numeric_limits<int>::max(),
-    1,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
 } // namespace openspace::properties
diff --git a/src/properties/scalar/longdoubleproperty.cpp b/src/properties/scalar/longdoubleproperty.cpp
deleted file mode 100644
index 5f74b6d550..0000000000
--- a/src/properties/scalar/longdoubleproperty.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/scalar/longdoubleproperty.h>
-
-#include <ghoul/lua/ghoul_lua.h>
-
-#include <limits>
-#include <sstream>
-
-namespace {
-
-long double fromLuaConversion(lua_State* state, bool& success) {
-    success = (lua_isnumber(state, -1) == 1);
-    if (success) {
-        long double val = static_cast<long double>(lua_tonumber(state, -1));
-        return val;
-    }
-    else {
-        return 0l;
-    }
-}
-
-bool toLuaConversion(lua_State* state, long double value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, long double inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    LongDoubleProperty,
-    long double,
-    0l,
-    std::numeric_limits<long double>::lowest(),
-    std::numeric_limits<long double>::max(),
-    0.01l,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
-} // namespace openspace::properties
diff --git a/src/properties/scalar/longlongproperty.cpp b/src/properties/scalar/longlongproperty.cpp
deleted file mode 100644
index f734194f10..0000000000
--- a/src/properties/scalar/longlongproperty.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/scalar/longlongproperty.h>
-
-#include <ghoul/lua/ghoul_lua.h>
-
-#include <limits>
-#include <sstream>
-
-namespace {
-
-long long fromLuaConversion(lua_State* state, bool& success) {
-    success = (lua_isnumber(state, -1) == 1);
-    if (success) {
-        long long val = static_cast<long long>(lua_tonumber(state, -1));
-        return val;
-    }
-    else {
-        return 0;
-    }
-}
-
-bool toLuaConversion(lua_State* state, long long value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, long long inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    LongLongProperty,
-    long long,
-    0,
-    std::numeric_limits<long long>::lowest(),
-    std::numeric_limits<long long>::max(),
-    1,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
-} // namespace openspace::properties
diff --git a/src/properties/scalar/longproperty.cpp b/src/properties/scalar/longproperty.cpp
index 128b1b7cc1..e3e3a5b07a 100644
--- a/src/properties/scalar/longproperty.cpp
+++ b/src/properties/scalar/longproperty.cpp
@@ -26,12 +26,22 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 
-#include <limits>
-#include <sstream>
+namespace openspace::properties {
 
-namespace {
+LongProperty::LongProperty(Property::PropertyInfo info, long value,
+                           long minValue, long maxValue, long stepValue)
+    : NumericalProperty<long>(std::move(info), value, minValue, maxValue, stepValue)
+{}
 
-long fromLuaConversion(lua_State* state, bool& success) {
+std::string LongProperty::className() const {
+    return "LongProperty";
+}
+
+int LongProperty::typeLua() const {
+    return LUA_TNUMBER;
+}
+
+long LongProperty::fromLuaConversion(lua_State* state, bool& success) const {
     success = (lua_isnumber(state, -1) == 1);
     if (success) {
         long val = static_cast<long>(lua_tonumber(state, -1));
@@ -42,31 +52,4 @@ long fromLuaConversion(lua_State* state, bool& success) {
     }
 }
 
-bool toLuaConversion(lua_State* state, long value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, long inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    LongProperty,
-    long,
-    long(0),
-    std::numeric_limits<long>::lowest(),
-    std::numeric_limits<long>::max(),
-    long(1),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
 } // namespace openspace::properties
diff --git a/src/properties/scalar/shortproperty.cpp b/src/properties/scalar/shortproperty.cpp
index 721de137d3..5069a3feab 100644
--- a/src/properties/scalar/shortproperty.cpp
+++ b/src/properties/scalar/shortproperty.cpp
@@ -26,12 +26,22 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 
-#include <limits>
-#include <sstream>
+namespace openspace::properties {
 
-namespace {
+ShortProperty::ShortProperty(Property::PropertyInfo info, short value, short minValue,
+                             short maxValue, short stepValue)
+    : NumericalProperty<short>(std::move(info), value, minValue, maxValue, stepValue)
+{}
 
-short fromLuaConversion(lua_State* state, bool& success) {
+std::string ShortProperty::className() const {
+    return "ShortProperty";
+}
+
+int ShortProperty::typeLua() const {
+    return LUA_TNUMBER;
+}
+
+short ShortProperty::fromLuaConversion(lua_State* state, bool& success) const {
     success = (lua_isnumber(state, -1) == 1);
     if (success) {
         short val = static_cast<short>(lua_tonumber(state, -1));
@@ -42,31 +52,4 @@ short fromLuaConversion(lua_State* state, bool& success) {
     }
 }
 
-bool toLuaConversion(lua_State* state, short value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, short inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    ShortProperty,
-    short,
-    short(0),
-    std::numeric_limits<short>::lowest(),
-    std::numeric_limits<short>::max(),
-    short(1),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
 } // namespace openspace::properties
diff --git a/src/properties/scalar/ucharproperty.cpp b/src/properties/scalar/ucharproperty.cpp
deleted file mode 100644
index 81430800ac..0000000000
--- a/src/properties/scalar/ucharproperty.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/scalar/ucharproperty.h>
-
-#include <ghoul/lua/ghoul_lua.h>
-
-#include <limits>
-#include <sstream>
-
-namespace {
-
-unsigned char fromLuaConversion(lua_State* state, bool& success) {
-    success = (lua_isnumber(state, -1) == 1);
-    if (success) {
-        unsigned char val = static_cast<unsigned char>(lua_tonumber(state, -1));
-        return val;
-    }
-    else {
-        return 0;
-    }
-}
-
-bool toLuaConversion(lua_State* state, unsigned char value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, unsigned char inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    UCharProperty,
-    unsigned char,
-    0,
-    std::numeric_limits<unsigned char>::lowest(),
-    std::numeric_limits<unsigned char>::max(),
-    1,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
-} // namespace openspace::properties
diff --git a/src/properties/scalar/uintproperty.cpp b/src/properties/scalar/uintproperty.cpp
index 87ce4145c3..496d17de9a 100644
--- a/src/properties/scalar/uintproperty.cpp
+++ b/src/properties/scalar/uintproperty.cpp
@@ -26,12 +26,29 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 
-#include <limits>
-#include <sstream>
+namespace openspace::properties {
 
-namespace {
+UIntProperty::UIntProperty(Property::PropertyInfo info, unsigned int value,
+                           unsigned int minValue, unsigned int maxValue,
+                           unsigned int stepValue)
+    : NumericalProperty<unsigned int>(
+        std::move(info),
+        value,
+        minValue,
+        maxValue,
+        stepValue
+    )
+{}
 
-unsigned int fromLuaConversion(lua_State* state, bool& success) {
+std::string UIntProperty::className() const {
+    return "UIntProperty";
+}
+
+int UIntProperty::typeLua() const {
+    return LUA_TNUMBER;
+}
+
+unsigned int UIntProperty::fromLuaConversion(lua_State* state, bool& success) const {
     success = (lua_isnumber(state, -1) == 1);
     if (success) {
         unsigned int val = static_cast<unsigned int>(lua_tonumber(state, -1));
@@ -42,31 +59,4 @@ unsigned int fromLuaConversion(lua_State* state, bool& success) {
     }
 }
 
-bool toLuaConversion(lua_State* state, unsigned int value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, unsigned int inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    UCharProperty,
-    unsigned int,
-    0,
-    std::numeric_limits<unsigned int>::lowest(),
-    std::numeric_limits<unsigned int>::max(),
-    1,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
 } // namespace openspace::properties
diff --git a/src/properties/scalar/ulonglongproperty.cpp b/src/properties/scalar/ulonglongproperty.cpp
deleted file mode 100644
index 012a479a18..0000000000
--- a/src/properties/scalar/ulonglongproperty.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/scalar/ulonglongproperty.h>
-
-#include <ghoul/lua/ghoul_lua.h>
-
-#include <limits>
-#include <sstream>
-
-namespace {
-
-unsigned long long fromLuaConversion(lua_State* state, bool& success) {
-    success = (lua_isnumber(state, -1) == 1);
-    if (success) {
-        unsigned long long val = static_cast<unsigned long long>(lua_tonumber(state, -1));
-        return val;
-    }
-    else {
-        return 0ull;
-    }
-}
-
-bool toLuaConversion(lua_State* state, unsigned long long value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, unsigned long long inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    ULongLongProperty,
-    unsigned long long,
-    1ull,
-    std::numeric_limits<unsigned long long>::lowest(),
-    std::numeric_limits<unsigned long long>::max(),
-    1ull,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
-} // namespace openspace::properties
diff --git a/src/properties/scalar/ulongproperty.cpp b/src/properties/scalar/ulongproperty.cpp
index 23eed4aec8..545d022aae 100644
--- a/src/properties/scalar/ulongproperty.cpp
+++ b/src/properties/scalar/ulongproperty.cpp
@@ -26,12 +26,29 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 
-#include <limits>
-#include <sstream>
+namespace openspace::properties {
 
-namespace {
+ULongProperty::ULongProperty(Property::PropertyInfo info, unsigned long value,
+                             unsigned long minValue, unsigned long maxValue,
+                             unsigned long stepValue)
+    : NumericalProperty<unsigned long>(
+        std::move(info),
+        value,
+        minValue,
+        maxValue,
+        stepValue
+    )
+{}
 
-unsigned long fromLuaConversion(lua_State* state, bool& success) {
+std::string ULongProperty::className() const {
+    return "ULongProperty";
+}
+
+int ULongProperty::typeLua() const {
+    return LUA_TNUMBER;
+}
+
+unsigned long ULongProperty::fromLuaConversion(lua_State* state, bool& success) const {
     success = (lua_isnumber(state, -1) == 1);
     if (success) {
         unsigned long val = static_cast<unsigned long>(lua_tonumber(state, -1));
@@ -42,31 +59,4 @@ unsigned long fromLuaConversion(lua_State* state, bool& success) {
     }
 }
 
-bool toLuaConversion(lua_State* state, unsigned long value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, unsigned long inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    ULongProperty,
-    unsigned long,
-    0ul,
-    std::numeric_limits<unsigned long>::lowest(),
-    std::numeric_limits<unsigned long>::max(),
-    1ul,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
 } // namespace openspace::properties
diff --git a/src/properties/scalar/ushortproperty.cpp b/src/properties/scalar/ushortproperty.cpp
index 1f4d97e183..7a54c1f0ea 100644
--- a/src/properties/scalar/ushortproperty.cpp
+++ b/src/properties/scalar/ushortproperty.cpp
@@ -26,12 +26,29 @@
 
 #include <ghoul/lua/ghoul_lua.h>
 
-#include <limits>
-#include <sstream>
+namespace openspace::properties {
 
-namespace {
+UShortProperty::UShortProperty(Property::PropertyInfo info, unsigned short value,
+                               unsigned short minValue, unsigned short maxValue,
+                               unsigned short stepValue)
+    : NumericalProperty<unsigned short>(
+        std::move(info),
+        value,
+        minValue,
+        maxValue,
+        stepValue
+    )
+{}
 
-unsigned short fromLuaConversion(lua_State* state, bool& success) {
+std::string UShortProperty::className() const {
+    return "UShortProperty";
+}
+
+int UShortProperty::typeLua() const {
+    return LUA_TNUMBER;
+}
+
+unsigned short UShortProperty::fromLuaConversion(lua_State* state, bool& success) const {
     success = (lua_isnumber(state, -1) == 1);
     if (success) {
         unsigned short val = static_cast<unsigned short>(lua_tonumber(state, -1));
@@ -42,31 +59,4 @@ unsigned short fromLuaConversion(lua_State* state, bool& success) {
     }
 }
 
-bool toLuaConversion(lua_State* state, unsigned short value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, unsigned short inValue) {
-    outValue = std::to_string(inValue);
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    UShortProperty,
-    unsigned short,
-    0,
-    std::numeric_limits<unsigned short>::lowest(),
-    std::numeric_limits<unsigned short>::max(),
-    1,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
 } // namespace openspace::properties
diff --git a/src/properties/scalar/wcharproperty.cpp b/src/properties/scalar/wcharproperty.cpp
deleted file mode 100644
index 73964f3896..0000000000
--- a/src/properties/scalar/wcharproperty.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/scalar/wcharproperty.h>
-
-#include <ghoul/lua/ghoul_lua.h>
-
-#include <limits>
-#include <sstream>
-
-namespace openspace::properties {
-
-int _StubToPreventLinkerWarningAboutMissingExportSymbols;
-
-// #define DEFAULT_FROM_LUA_LAMBDA(wchar_t, DEFAULT_VALUE)
-//     [](lua_State* state, bool& success) -> wchar_t {
-//         success = (lua_isnumber(state, -1) == 1);
-//         if (success) {
-//             return static_cast<wchar_t>(lua_tonumber(state, -1));
-//         }
-//         else {
-//             return DEFAULT_VALUE;
-//         }
-//     }
-
-// #define DEFAULT_TO_LUA_LAMBDA(wchar_t)
-//     [](lua_State* state, wchar_t value) -> bool {
-//         lua_pushnumber(state, static_cast<lua_Number>(value));
-//         return true;
-//     }
-
-// #define DEFAULT_FROM_STRING_LAMBDA(wchar_t, DEFAULT_VALUE)
-//     [](std::string val, bool& success) -> wchar_t {
-//         std::stringstream s(val);
-//         wchar_t v;
-//         s >> v;
-//         success = !s.fail();
-//         if (success) {
-//             return v;
-//         }
-//     }
-
-//REGISTER_NUMERICALPROPERTY_SOURCE(WCharProperty, wchar_t, wchar_t(0),
-//                                  numeric_limits<wchar_t>::lowest(),
-//                                  numeric_limits<wchar_t>::max(), wchar_t(1),
-//                                  DEFAULT_FROM_LUA_LAMBDA(wchar_t, wchar_t(0)),
-//                                  DEFAULT_TO_LUA_LAMBDA(wchar_t),
-//                                  DEFAULT_FROM_STRING_LAMBDA(wchar_t, wchar_t(0)),
-//                                  DEFAULT_TO_STRING_LAMBDA(wchar_t),
-//                                  LUA_TNUMBER);
-
-} // namespace openspace::properties
diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp
index d80d48a345..1e1e37d180 100644
--- a/src/properties/selectionproperty.cpp
+++ b/src/properties/selectionproperty.cpp
@@ -43,6 +43,14 @@ SelectionProperty::SelectionProperty(Property::PropertyInfo info)
     : TemplateProperty(std::move(info), std::set<std::string>())
 {}
 
+std::string SelectionProperty::className() const {
+    return "SelectionProperty";
+}
+
+int SelectionProperty::typeLua() const {
+    return LUA_TTABLE;
+}
+
 void SelectionProperty::setValue(std::set<std::string> val) {
     ghoul_assert(!_options.empty(), "Cannot set selection before options have been set");
 
@@ -76,18 +84,18 @@ const std::vector<std::string>& SelectionProperty::options() const {
 }
 
 void SelectionProperty::setOptions(const std::vector<std::string>& keys) {
-    std::vector<std::string> options;
-    options.reserve(keys.size());
+    _options.clear();
+    _options.reserve(keys.size());
 
     for (const std::string& key : keys) {
         if (!hasOption(key)) {
-            options.push_back(key);
+            _options.push_back(key);
         }
         else {
             LWARNING(fmt::format("Ignoring duplicated key '{}'", key));
         }
     }
-    _options = std::move(options);
+    _options.shrink_to_fit();
     sortOptions();
 
     // In case we have a selection, remove non-existing options
@@ -121,44 +129,8 @@ void SelectionProperty::clearOptions() {
     clearSelection();
 }
 
-void SelectionProperty::sortOptions() {
-    std::sort(_options.begin(), _options.end());
-}
-
-bool SelectionProperty::removeInvalidKeys(std::set<std::string>& keys) {
-    bool changed = false;
-    std::set<std::string>::iterator it = keys.begin();
-    while (it != keys.end()) {
-        if (!hasOption(*it)) {
-            LWARNING(fmt::format(
-                "Key '{}' is not a valid option and is removed from selection", *it
-            ));
-            keys.erase(it);
-            changed = true;
-        }
-        it++;
-    }
-    return changed;
-}
-
-std::string SelectionProperty::generateAdditionalJsonDescription() const {
-    nlohmann::json optionsJson(_options);
-    std::string result = "{ ";
-    result += fmt::format("\"{}\": {}", OptionsKey, optionsJson.dump());
-    result += " }";
-    return result;
-}
-
-template <>
-std::string PropertyDelegate<TemplateProperty<std::set<std::string>>>::className() {
-    return "SelectionProperty";
-}
-
-template <>
-template <>
-std::set<std::string>
-PropertyDelegate<TemplateProperty<std::set<std::string>>>::fromLuaValue(
-                                                         lua_State* state, bool& success)
+std::set<std::string> SelectionProperty::fromLuaConversion(lua_State* state,
+                                                           bool& success) const
 {
     static const int KEY = -2;
     static const int VAL = -1;
@@ -186,35 +158,50 @@ PropertyDelegate<TemplateProperty<std::set<std::string>>>::fromLuaValue(
     return result;
 }
 
-template <>
-template <>
-bool PropertyDelegate<TemplateProperty<std::set<std::string>>>::toLuaValue(
-                              lua_State* state, const std::set<std::string>& value)
-{
+void SelectionProperty::toLuaConversion(lua_State* state) const {
     lua_newtable(state);
     int i = 1;
-    for (const std::string& v : value) {
+    for (const std::string& v : _value) {
         lua_pushinteger(state, i);
         lua_pushstring(state, v.c_str());
         lua_settable(state, -3);
         ++i;
     }
-    return true;
 }
 
-template <>
-int PropertyDelegate<TemplateProperty<std::set<std::string>>>::typeLua() {
-    return LUA_TTABLE;
+std::string SelectionProperty::toStringConversion() const {
+    nlohmann::json json(_value);
+    return json.dump();
 }
 
-template <>
-template <>
-bool PropertyDelegate<TemplateProperty<std::set<std::string>>>::toString(
-                       std::string& outValue, const std::set<std::string>& inValue)
-{
-    nlohmann::json json(inValue);
-    outValue = json.dump();
-    return true;
+void SelectionProperty::sortOptions() {
+    std::sort(_options.begin(), _options.end());
+}
+
+bool SelectionProperty::removeInvalidKeys(std::set<std::string>& keys) {
+    bool changed = false;
+    std::set<std::string>::iterator it = keys.begin();
+    while (it != keys.end()) {
+        if (!hasOption(*it)) {
+            LWARNING(fmt::format(
+                "Key '{}' is not a valid option and is removed from selection", *it
+            ));
+            it = keys.erase(it);
+            changed = true;
+        }
+        else {
+            it++;
+        }
+    }
+    return changed;
+}
+
+std::string SelectionProperty::generateAdditionalJsonDescription() const {
+    nlohmann::json optionsJson(_options);
+    std::string result = "{ ";
+    result += fmt::format("\"{}\": {}", OptionsKey, optionsJson.dump());
+    result += " }";
+    return result;
 }
 
 } // namespace openspace::properties
diff --git a/src/properties/stringproperty.cpp b/src/properties/stringproperty.cpp
index c49ad3b311..53a90ce242 100644
--- a/src/properties/stringproperty.cpp
+++ b/src/properties/stringproperty.cpp
@@ -25,44 +25,36 @@
 #include <openspace/properties/stringproperty.h>
 
 #include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/lua/lua_helper.h>
 #include <openspace/json.h>
 
-namespace {
-
-std::string fromLuaConversion(lua_State* state, bool& success) {
-    success = lua_isstring(state, -1) == 1;
-    if (success) {
-        return lua_tostring(state, -1);
-    }
-    else {
-        return "";
-    }
-}
-
-bool toLuaConversion(lua_State* state, const std::string& val) {
-    lua_pushstring(state, val.c_str());
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, std::string inValue) {
-    nlohmann::json json;
-    nlohmann::to_json(json, inValue);
-    outValue = json.dump();
-    return true;
-}
-
-} // namespace
-
 namespace openspace::properties {
 
-REGISTER_TEMPLATEPROPERTY_SOURCE(
-    StringProperty,
-    std::string,
-    "",
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TSTRING
-)
+StringProperty::StringProperty(Property::PropertyInfo info, std::string value)
+    : TemplateProperty<std::string>(info, value)
+{}
+
+std::string StringProperty::className() const {
+    return "StringProperty";
+}
+
+int StringProperty::typeLua() const {
+    return LUA_TSTRING;
+}
+
+std::string StringProperty::fromLuaConversion(lua_State* state, bool& success) const {
+    success = lua_isstring(state, -1) == 1;
+    return success ? lua_tostring(state, -1) : "";
+}
+
+void StringProperty::toLuaConversion(lua_State* state) const {
+    ghoul::lua::push(state, _value);
+}
+
+std::string StringProperty::toStringConversion() const {
+    nlohmann::json json;
+    nlohmann::to_json(json, _value);
+    return json.dump();
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/bvec2property.cpp b/src/properties/vector/bvec2property.cpp
deleted file mode 100644
index 36e4d3cb97..0000000000
--- a/src/properties/vector/bvec2property.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/vector/bvec2property.h>
-
-#include <ghoul/glm.h>
-#include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::bvec2 fromLuaConversion(lua_State* state, bool& success) {
-    glm::bvec2 result = glm::bvec2(false);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::bvec2>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::bvec2(false);
-        }
-        if (lua_isboolean(state, -1) != 1) {
-            success = false;
-            return glm::bvec2(false);
-        }
-        else {
-            result[i] = static_cast<glm::bvec2::value_type>(lua_toboolean(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::bvec2 val) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::bvec2>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(val[i]));
-        lua_setfield(state, -2, std::to_string(number).c_str());
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::bvec2 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::bvec2>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_TEMPLATEPROPERTY_SOURCE(
-    BVec2Property,
-    glm::bvec2,
-    glm::bvec2(false),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-} // namespace openspace::properties
diff --git a/src/properties/vector/bvec3property.cpp b/src/properties/vector/bvec3property.cpp
deleted file mode 100644
index 3f88e952ab..0000000000
--- a/src/properties/vector/bvec3property.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/vector/bvec3property.h>
-
-#include <ghoul/glm.h>
-#include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::bvec3 fromLuaConversion(lua_State* state, bool& success) {
-    glm::bvec3 result = glm::bvec3(false);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::bvec3>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::bvec3(false);
-        }
-        if (lua_isboolean(state, -1) != 1) {
-            success = false;
-            return glm::bvec3(false);
-        }
-        else {
-            result[i] = static_cast<glm::bvec3::value_type>(lua_toboolean(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::bvec3 val) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::bvec3>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(val[i]));
-        lua_setfield(state, -2, std::to_string(number).c_str());
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::bvec3 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::bvec3>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_TEMPLATEPROPERTY_SOURCE(
-    BVec3Property,
-    glm::bvec3,
-    glm::bvec3(false),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-} // namespace openspace::properties
diff --git a/src/properties/vector/bvec4property.cpp b/src/properties/vector/bvec4property.cpp
deleted file mode 100644
index 757627580a..0000000000
--- a/src/properties/vector/bvec4property.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby 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/properties/vector/bvec4property.h>
-
-#include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/glm.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::bvec4 fromLuaConversion(lua_State* state, bool& success) {
-    glm::bvec4 result = glm::bvec4(false);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::bvec4>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::bvec4(false);
-        }
-        if (lua_isboolean(state, -1) != 1) {
-            success = false;
-            return glm::bvec4(false);
-        }
-        else {
-            result[i] = static_cast<glm::bvec4::value_type>(lua_toboolean(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::bvec4 val) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::bvec4>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(val[i]));
-        lua_setfield(state, -2, std::to_string(number).c_str());
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::bvec4 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::bvec4>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_TEMPLATEPROPERTY_SOURCE(
-    BVec4Property,
-    glm::bvec4,
-    glm::bvec4(false),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
-
-} // namespace openspace::properties
diff --git a/src/properties/vector/dvec2property.cpp b/src/properties/vector/dvec2property.cpp
index 8425840430..132a94985f 100644
--- a/src/properties/vector/dvec2property.cpp
+++ b/src/properties/vector/dvec2property.cpp
@@ -25,74 +25,32 @@
 #include <openspace/properties/vector/dvec2property.h>
 
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/glm.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::dvec2 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dvec2 result = glm::dvec2(0.0);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::dvec2>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::dvec2(0.0);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::dvec2(0.0);
-        }
-        else {
-            result[i] = lua_tonumber(state, -1);
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dvec2 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::dvec2>::value; ++i) {
-        lua_pushnumber(state, value[i]);
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dvec2 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::dvec2>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DVec2Property,
-    glm::dvec2,
-    glm::dvec2(0.0),
-    glm::dvec2(std::numeric_limits<double>::lowest()),
-    glm::dvec2(std::numeric_limits<double>::max()),
-    glm::dvec2(0.01),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+DVec2Property::DVec2Property(Property::PropertyInfo info, glm::dvec2 value,
+                             glm::dvec2 minValue, glm::dvec2 maxValue,
+                             glm::dvec2 stepValue)
+    : NumericalProperty<glm::dvec2>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string DVec2Property::className() const {
+    return "DVec2Property";
+}
+
+int DVec2Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::dvec2 DVec2Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::dvec2>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/dvec3property.cpp b/src/properties/vector/dvec3property.cpp
index e97b87a7a4..4937c8d39e 100644
--- a/src/properties/vector/dvec3property.cpp
+++ b/src/properties/vector/dvec3property.cpp
@@ -24,75 +24,33 @@
 
 #include <openspace/properties/vector/dvec3property.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::dvec3 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dvec3 result = glm::dvec3(0.0);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::dvec3>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::dvec3(0.0);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::dvec3(0.0);
-        }
-        else {
-            result[i] = lua_tonumber(state, -1);
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dvec3 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::dvec3>::value; ++i) {
-        lua_pushnumber(state, value[i]);
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dvec3 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::dvec3>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DVec3Property,
-    glm::dvec3,
-    glm::dvec3(0.0),
-    glm::dvec3(std::numeric_limits<double>::lowest()),
-    glm::dvec3(std::numeric_limits<double>::max()),
-    glm::dvec3(0.01),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+DVec3Property::DVec3Property(Property::PropertyInfo info, glm::dvec3 value,
+                             glm::dvec3 minValue, glm::dvec3 maxValue,
+                             glm::dvec3 stepValue)
+    : NumericalProperty<glm::dvec3>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string DVec3Property::className() const {
+    return "DVec3Property";
+}
+
+int DVec3Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::dvec3 DVec3Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::dvec3>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/dvec4property.cpp b/src/properties/vector/dvec4property.cpp
index 0fdbe9f3e3..31119da29d 100644
--- a/src/properties/vector/dvec4property.cpp
+++ b/src/properties/vector/dvec4property.cpp
@@ -24,75 +24,33 @@
 
 #include <openspace/properties/vector/dvec4property.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::dvec4 fromLuaConversion(lua_State* state, bool& success) {
-    glm::dvec4 result = glm::dvec4(0.0);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::dvec4>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::dvec4(0.0);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::dvec4(0.0);
-        }
-        else {
-            result[i] = lua_tonumber(state, -1);
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::dvec4 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::dvec4>::value; ++i) {
-        lua_pushnumber(state, value[i]);
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::dvec4 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::dvec4>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    DVec4Property,
-    glm::dvec4,
-    glm::dvec4(0.0),
-    glm::dvec4(std::numeric_limits<double>::lowest()),
-    glm::dvec4(std::numeric_limits<double>::max()),
-    glm::dvec4(0.01),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+DVec4Property::DVec4Property(Property::PropertyInfo info, glm::dvec4 value,
+                             glm::dvec4 minValue, glm::dvec4 maxValue,
+                             glm::dvec4 stepValue)
+    : NumericalProperty<glm::dvec4>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string DVec4Property::className() const {
+    return "DVec4Property";
+}
+
+int DVec4Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::dvec4 DVec4Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::dvec4>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/ivec2property.cpp b/src/properties/vector/ivec2property.cpp
index 42296a1d9f..851f2fb8d0 100644
--- a/src/properties/vector/ivec2property.cpp
+++ b/src/properties/vector/ivec2property.cpp
@@ -24,75 +24,33 @@
 
 #include <openspace/properties/vector/ivec2property.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::ivec2 fromLuaConversion(lua_State* state, bool& success) {
-    glm::ivec2 result = glm::ivec2(0);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::ivec2>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::ivec2(0);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::ivec2(0);
-        }
-        else {
-            result[i] = static_cast<glm::ivec2::value_type>(lua_tonumber(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::ivec2 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::ivec2>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(value[i]));
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::ivec2 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::ivec2>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    IVec2Property,
-    glm::ivec2,
-    glm::ivec2(0),
-    glm::ivec2(std::numeric_limits<int>::lowest()),
-    glm::ivec2(std::numeric_limits<int>::max()),
-    glm::ivec2(1),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+IVec2Property::IVec2Property(Property::PropertyInfo info, glm::ivec2 value,
+                             glm::ivec2 minValue, glm::ivec2 maxValue,
+                             glm::ivec2 stepValue)
+    : NumericalProperty<glm::ivec2>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string IVec2Property::className() const {
+    return "IVec2Property";
+}
+
+int IVec2Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::ivec2 IVec2Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::ivec2>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/ivec3property.cpp b/src/properties/vector/ivec3property.cpp
index 96b12bec64..211f250a6b 100644
--- a/src/properties/vector/ivec3property.cpp
+++ b/src/properties/vector/ivec3property.cpp
@@ -24,75 +24,33 @@
 
 #include <openspace/properties/vector/ivec3property.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::ivec3 fromLuaConversion(lua_State* state, bool& success) {
-    glm::ivec3 result = glm::ivec3(0);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::ivec3>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::ivec3(0);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::ivec3(0);
-        }
-        else {
-            result[i] = static_cast<glm::ivec3::value_type>(lua_tonumber(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::ivec3 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::ivec3>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(value[i]));
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::ivec3 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::ivec3>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    IVec3Property,
-    glm::ivec3,
-    glm::ivec3(0),
-    glm::ivec3(std::numeric_limits<int>::lowest()),
-    glm::ivec3(std::numeric_limits<int>::max()),
-    glm::ivec3(1),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+IVec3Property::IVec3Property(Property::PropertyInfo info, glm::ivec3 value,
+                             glm::ivec3 minValue, glm::ivec3 maxValue,
+                             glm::ivec3 stepValue)
+    : NumericalProperty<glm::ivec3>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string IVec3Property::className() const {
+    return "IVec3Property";
+}
+
+int IVec3Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::ivec3 IVec3Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::ivec3>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/ivec4property.cpp b/src/properties/vector/ivec4property.cpp
index 416bd76e94..3646c49768 100644
--- a/src/properties/vector/ivec4property.cpp
+++ b/src/properties/vector/ivec4property.cpp
@@ -24,75 +24,33 @@
 
 #include <openspace/properties/vector/ivec4property.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::ivec4 fromLuaConversion(lua_State* state, bool& success) {
-    glm::ivec4 result = glm::ivec4(0);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::ivec4>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::ivec4(0);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::ivec4(0);
-        }
-        else {
-            result[i] = static_cast<glm::ivec4::value_type>(lua_tonumber(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::ivec4 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::ivec4>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(value[i]));
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::ivec4 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::ivec4>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    IVec4Property,
-    glm::ivec4,
-    glm::ivec4(0),
-    glm::ivec4(std::numeric_limits<int>::lowest()),
-    glm::ivec4(std::numeric_limits<int>::max()),
-    glm::ivec4(1),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+IVec4Property::IVec4Property(Property::PropertyInfo info, glm::ivec4 value,
+                             glm::ivec4 minValue, glm::ivec4 maxValue,
+                             glm::ivec4 stepValue)
+    : NumericalProperty<glm::ivec4>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string IVec4Property::className() const {
+    return "IVec4Property";
+}
+
+int IVec4Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::ivec4 IVec4Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::ivec4>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/uvec2property.cpp b/src/properties/vector/uvec2property.cpp
index 7a98c9feea..94591b4ae6 100644
--- a/src/properties/vector/uvec2property.cpp
+++ b/src/properties/vector/uvec2property.cpp
@@ -24,75 +24,33 @@
 
 #include <openspace/properties/vector/uvec2property.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::uvec2 fromLuaConversion(lua_State* state, bool& success) {
-    glm::uvec2 result = glm::uvec2(0);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::uvec2>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::uvec2(0);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::uvec2(0);
-        }
-        else {
-            result[i] = static_cast<glm::uvec2::value_type>(lua_tonumber(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::uvec2 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::uvec2>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(value[i]));
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::uvec2 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::uvec2>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    UVec2Property,
-    glm::uvec2,
-    glm::uvec2(0),
-    glm::uvec2(std::numeric_limits<unsigned int>::lowest()),
-    glm::uvec2(std::numeric_limits<unsigned int>::max()),
-    glm::uvec2(1),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+UVec2Property::UVec2Property(Property::PropertyInfo info, glm::uvec2 value,
+                             glm::uvec2 minValue, glm::uvec2 maxValue,
+                             glm::uvec2 stepValue)
+    : NumericalProperty<glm::uvec2>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string UVec2Property::className() const {
+    return "UVec2Property";
+}
+
+int UVec2Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::uvec2 UVec2Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::uvec2>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/uvec3property.cpp b/src/properties/vector/uvec3property.cpp
index b387254a99..31000d5200 100644
--- a/src/properties/vector/uvec3property.cpp
+++ b/src/properties/vector/uvec3property.cpp
@@ -24,75 +24,33 @@
 
 #include <openspace/properties/vector/uvec3property.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::uvec3 fromLuaConversion(lua_State* state, bool& success) {
-    glm::uvec3 result = glm::uvec3(0);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::uvec3>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::uvec3(0);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::uvec3(0);
-        }
-        else {
-            result[i] = static_cast<glm::uvec3::value_type>(lua_tonumber(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::uvec3 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::uvec3>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(value[i]));
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::uvec3 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::uvec3>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    UVec3Property,
-    glm::uvec3,
-    glm::uvec3(0),
-    glm::uvec3(std::numeric_limits<unsigned int>::lowest()),
-    glm::uvec3(std::numeric_limits<unsigned int>::max()),
-    glm::uvec3(1),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+UVec3Property::UVec3Property(Property::PropertyInfo info, glm::uvec3 value,
+                             glm::uvec3 minValue, glm::uvec3 maxValue,
+                             glm::uvec3 stepValue)
+    : NumericalProperty<glm::uvec3>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string UVec3Property::className() const {
+    return "UVec3Property";
+}
+
+int UVec3Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::uvec3 UVec3Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::uvec3>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/uvec4property.cpp b/src/properties/vector/uvec4property.cpp
index c42868a2bc..71f5cdbbb7 100644
--- a/src/properties/vector/uvec4property.cpp
+++ b/src/properties/vector/uvec4property.cpp
@@ -24,75 +24,33 @@
 
 #include <openspace/properties/vector/uvec4property.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::uvec4 fromLuaConversion(lua_State* state, bool& success) {
-    glm::uvec4 result = glm::uvec4(0);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::uvec4>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::uvec4(0);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::uvec4(0);
-        }
-        else {
-            result[i] = static_cast<glm::uvec4::value_type>(lua_tonumber(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::uvec4 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::uvec4>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(value[i]));
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::uvec4 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::uvec4>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    UVec4Property,
-    glm::uvec4,
-    glm::uvec4(0),
-    glm::uvec4(std::numeric_limits<unsigned int>::lowest()),
-    glm::uvec4(std::numeric_limits<unsigned int>::max()),
-    glm::uvec4(1),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+UVec4Property::UVec4Property(Property::PropertyInfo info, glm::uvec4 value,
+                             glm::uvec4 minValue, glm::uvec4 maxValue,
+                             glm::uvec4 stepValue)
+    : NumericalProperty<glm::uvec4>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string UVec4Property::className() const {
+    return "UVec4Property";
+}
+
+int UVec4Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::uvec4 UVec4Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::uvec4>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/vec2property.cpp b/src/properties/vector/vec2property.cpp
index 61bca8403e..c3c0f9e75b 100644
--- a/src/properties/vector/vec2property.cpp
+++ b/src/properties/vector/vec2property.cpp
@@ -24,75 +24,32 @@
 
 #include <openspace/properties/vector/vec2property.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::vec2 fromLuaConversion(lua_State* state, bool& success) {
-    glm::vec2 result = glm::vec2(0.f);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::vec2>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::vec2(0.f);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::vec2(0.f);
-        }
-        else {
-            result[i] = static_cast<glm::vec2::value_type>(lua_tonumber(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::vec2 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::vec2>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(value[i]));
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::vec2 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::vec2>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Vec2Property,
-    glm::vec2,
-    glm::vec2(0.f),
-    glm::vec2(std::numeric_limits<float>::lowest()),
-    glm::vec2(std::numeric_limits<float>::max()),
-    glm::vec2(0.01f),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+Vec2Property::Vec2Property(Property::PropertyInfo info, glm::vec2 value,
+                           glm::vec2 minValue, glm::vec2 maxValue, glm::vec2 stepValue)
+    : NumericalProperty<glm::vec2>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string Vec2Property::className() const {
+    return "Vec2Property";
+}
+
+int Vec2Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::vec2 Vec2Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::vec2>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/vec3property.cpp b/src/properties/vector/vec3property.cpp
index d77093ed90..a9e0fd9471 100644
--- a/src/properties/vector/vec3property.cpp
+++ b/src/properties/vector/vec3property.cpp
@@ -24,74 +24,32 @@
 
 #include <openspace/properties/vector/vec3property.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::vec3 fromLuaConversion(lua_State* state, bool& success) {
-    glm::vec3 result = glm::vec3(0.f);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::vec3>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::vec3(0.f);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::vec3(0.f);
-        }
-        else {
-            result[i] = static_cast<glm::vec3::value_type>(lua_tonumber(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::vec3 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::vec3>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(value[i]));
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::vec3 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::vec3>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Vec3Property,
-    glm::vec3,
-    glm::vec3(0.f),
-    glm::vec3(std::numeric_limits<float>::lowest()),
-    glm::vec3(std::numeric_limits<float>::max()),
-    glm::vec3(0.01f),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+Vec3Property::Vec3Property(Property::PropertyInfo info, glm::vec3 value,
+                           glm::vec3 minValue, glm::vec3 maxValue, glm::vec3 stepValue)
+    : NumericalProperty<glm::vec3>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string Vec3Property::className() const {
+    return "Vec3Property";
+}
+
+int Vec3Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::vec3 Vec3Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::vec3>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/properties/vector/vec4property.cpp b/src/properties/vector/vec4property.cpp
index 538e9270ea..374d5ef3f9 100644
--- a/src/properties/vector/vec4property.cpp
+++ b/src/properties/vector/vec4property.cpp
@@ -24,75 +24,32 @@
 
 #include <openspace/properties/vector/vec4property.h>
 
-#include <ghoul/glm.h>
 #include <ghoul/lua/ghoul_lua.h>
-#include <ghoul/misc/misc.h>
-#include <limits>
-#include <sstream>
-
-namespace {
-
-glm::vec4 fromLuaConversion(lua_State* state, bool& success) {
-    glm::vec4 result = glm::vec4(0.f);
-    lua_pushnil(state);
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::vec4>::value; ++i) {
-        int hasNext = lua_next(state, -2);
-        if (hasNext != 1) {
-            success = false;
-            return glm::vec4(0.f);
-        }
-        if (lua_isnumber(state, -1) != 1) {
-            success = false;
-            return glm::vec4(0.f);
-        }
-        else {
-            result[i] = static_cast<glm::vec4::value_type>(lua_tonumber(state, -1));
-            lua_pop(state, 1);
-        }
-    }
-
-    // The last accessor argument is still on the stack
-    lua_pop(state, 1);
-    success = true;
-    return result;
-}
-
-bool toLuaConversion(lua_State* state, glm::vec4 value) {
-    lua_newtable(state);
-    int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::vec4>::value; ++i) {
-        lua_pushnumber(state, static_cast<lua_Number>(value[i]));
-        lua_rawseti(state, -2, number);
-        ++number;
-    }
-    return true;
-}
-
-bool toStringConversion(std::string& outValue, glm::vec4 inValue) {
-    outValue = "{";
-    for (glm::length_t i = 0; i < ghoul::glm_components<glm::vec4>::value; ++i) {
-        outValue += std::to_string(inValue[i]) + ",";
-    }
-    outValue.pop_back();
-    outValue += "}";
-    return true;
-}
-
-} // namespace
+#include <ghoul/lua/lua_helper.h>
 
 namespace openspace::properties {
 
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    Vec4Property,
-    glm::vec4,
-    glm::vec4(0.f),
-    glm::vec4(std::numeric_limits<float>::lowest()),
-    glm::vec4(std::numeric_limits<float>::max()),
-    glm::vec4(0.01f),
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TTABLE
-)
+Vec4Property::Vec4Property(Property::PropertyInfo info, glm::vec4 value,
+                           glm::vec4 minValue, glm::vec4 maxValue, glm::vec4 stepValue)
+    : NumericalProperty<glm::vec4>(
+        std::move(info),
+        std::move(value),
+        std::move(minValue),
+        std::move(maxValue),
+        std::move(stepValue)
+    )
+{}
+
+std::string Vec4Property::className() const {
+    return "Vec4Property";
+}
+
+int Vec4Property::typeLua() const {
+    return LUA_TTABLE;
+}
+
+glm::vec4 Vec4Property::fromLuaConversion(lua_State* state, bool& success) const {
+    return ghoul::lua::tryGetValue<glm::vec4>(state, success);
+}
 
 } // namespace openspace::properties
diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp
index d0f7e6ff39..05b9954d14 100644
--- a/src/rendering/dashboarditem.cpp
+++ b/src/rendering/dashboarditem.cpp
@@ -67,9 +67,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardItem::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "dashboarditem";
-    return doc;
+    return codegen::doc<Parameters>("dashboarditem");
 }
 
 std::unique_ptr<DashboardItem> DashboardItem::createFromDictionary(
diff --git a/src/rendering/dashboardtextitem.cpp b/src/rendering/dashboardtextitem.cpp
index fae12f4403..cf811a6b2e 100644
--- a/src/rendering/dashboardtextitem.cpp
+++ b/src/rendering/dashboardtextitem.cpp
@@ -57,9 +57,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation DashboardTextItem::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "dashboardtextitem";
-    return doc;
+    return codegen::doc<Parameters>("dashboardtextitem");
 }
 
 DashboardTextItem::DashboardTextItem(const ghoul::Dictionary& dictionary, float fontSize,
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 70c9b8bc07..f25d3aa4e2 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -43,6 +43,7 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/textureunit.h>
+#include <glm/gtc/type_ptr.hpp>
 #include <fstream>
 #include <string>
 #include <vector>
@@ -75,17 +76,18 @@ namespace {
 
     constexpr const glm::vec4 PosBufferClearVal = { 1e32, 1e32, 1e32, 1.f };
 
-    constexpr const std::array<const char*, 7> HDRUniformNames = {
+    constexpr const std::array<const char*, 9> HDRUniformNames = {
         "hdrFeedingTexture", "blackoutFactor", "hdrExposure", "gamma",
-        "Hue", "Saturation", "Value"
+        "Hue", "Saturation", "Value", "Viewport", "Resolution"
     };
 
-    constexpr const std::array<const char*, 2> FXAAUniformNames = {
-        "renderedTexture", "inverseScreenSize"
+    constexpr const std::array<const char*, 4> FXAAUniformNames = {
+        "renderedTexture", "inverseScreenSize", "Viewport", "Resolution"
     };
 
-    constexpr const std::array<const char*, 2> DownscaledVolumeUniformNames = {
-        "downscaledRenderedVolume", "downscaledRenderedVolumeDepth"
+    constexpr const std::array<const char*, 4> DownscaledVolumeUniformNames = {
+        "downscaledRenderedVolume", "downscaledRenderedVolumeDepth", "viewport",
+        "resolution"
     };
 
     constexpr const char* ExitFragmentShaderPath =
@@ -447,7 +449,7 @@ void FramebufferRenderer::deferredcastersChanged(Deferredcaster&,
     _dirtyDeferredcastData = true;
 }
 
-void FramebufferRenderer::applyTMO(float blackoutFactor) {
+void FramebufferRenderer::applyTMO(float blackoutFactor, const glm::ivec4& viewport) {
     ZoneScoped
     TracyGpuZone("applyTMO")
 
@@ -468,6 +470,8 @@ void FramebufferRenderer::applyTMO(float blackoutFactor) {
     _hdrFilteringProgram->setUniform(_hdrUniformCache.Hue, _hue);
     _hdrFilteringProgram->setUniform(_hdrUniformCache.Saturation, _saturation);
     _hdrFilteringProgram->setUniform(_hdrUniformCache.Value, _value);
+    _hdrFilteringProgram->setUniform(_hdrUniformCache.Viewport, glm::vec4(viewport));
+    _hdrFilteringProgram->setUniform(_hdrUniformCache.Resolution, glm::vec2(_resolution));
 
     glDepthMask(false);
     glDisable(GL_DEPTH_TEST);
@@ -482,7 +486,7 @@ void FramebufferRenderer::applyTMO(float blackoutFactor) {
     _hdrFilteringProgram->deactivate();
 }
 
-void FramebufferRenderer::applyFXAA() {
+void FramebufferRenderer::applyFXAA(const glm::ivec4& viewport) {
     _fxaaProgram->activate();
 
     ghoul::opengl::TextureUnit renderedTextureUnit;
@@ -497,8 +501,10 @@ void FramebufferRenderer::applyFXAA() {
         renderedTextureUnit
     );
 
-    glm::vec2 inverseScreenSize(1.f/_resolution.x, 1.f/_resolution.y);
+    glm::vec2 inverseScreenSize = glm::vec2(1.f / _resolution.x, 1.f / _resolution.y);
     _fxaaProgram->setUniform(_fxaaUniformCache.inverseScreenSize, inverseScreenSize);
+    _fxaaProgram->setUniform(_fxaaUniformCache.Viewport, glm::vec4(viewport));
+    _fxaaProgram->setUniform(_fxaaUniformCache.Resolution, glm::vec2(_resolution));
 
     glDepthMask(false);
     glDisable(GL_DEPTH_TEST);
@@ -532,8 +538,8 @@ void FramebufferRenderer::updateDownscaleTextures() {
     );
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    float volumeBorderColor[] = { 0.0f, 0.0f, 0.0f, 1.0f };
-    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, volumeBorderColor);
+    constexpr const float VolumeBorderColor[] = { 0.f, 0.f, 0.f, 1.f };
+    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, VolumeBorderColor);
 
     glBindTexture(GL_TEXTURE_2D, _downscaleVolumeRendering.depthbuffer);
     glTexImage2D(
@@ -555,10 +561,7 @@ void FramebufferRenderer::updateDownscaleTextures() {
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 }
 
-void FramebufferRenderer::writeDownscaledVolume() {
-    glEnablei(GL_BLEND, 0);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-
+void FramebufferRenderer::writeDownscaledVolume(const glm::ivec4& viewport) {
     _downscaledVolumeProgram->activate();
 
     ghoul::opengl::TextureUnit downscaledTextureUnit;
@@ -585,9 +588,26 @@ void FramebufferRenderer::writeDownscaledVolume() {
         downscaledDepthUnit
     );
 
+    _downscaledVolumeProgram->setUniform(
+        _writeDownscaledVolumeUniformCache.viewport,
+        static_cast<float>(viewport[0]),
+        static_cast<float>(viewport[1]),
+        static_cast<float>(viewport[2]),
+        static_cast<float>(viewport[3])
+    );
+    _downscaledVolumeProgram->setUniform(
+        _writeDownscaledVolumeUniformCache.resolution,
+        glm::vec2(_resolution)
+    );
+
 
     glEnablei(GL_BLEND, 0);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+
+    // (abock, 2021-04-30) I changed the blend function as the front-to-back blending
+    // didn't work for the milkyway volume and was causing the edges of the milkyway to
+    // disappear
+    //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glBlendFunc(GL_ONE, GL_ONE);
 
     glDisable(GL_DEPTH_TEST);
 
@@ -1022,18 +1042,18 @@ void FramebufferRenderer::updateDeferredcastData() {
     for (Deferredcaster* caster : deferredcasters) {
         DeferredcastData data = { nextId++, "HELPER" };
 
-        std::string vsPath = caster->deferredcastVSPath();
-        std::string fsPath = caster->deferredcastFSPath();
-        std::string deferredShaderPath = caster->deferredcastPath();
+        std::filesystem::path vsPath = caster->deferredcastVSPath();
+        std::filesystem::path fsPath = caster->deferredcastFSPath();
+        std::filesystem::path deferredShaderPath = caster->deferredcastPath();
 
         ghoul::Dictionary dict;
         dict.setValue("rendererData", _rendererData);
         //dict.setValue("fragmentPath", fsPath);
         dict.setValue("id", data.id);
-        std::string helperPath = caster->helperPath();
+        std::filesystem::path helperPath = caster->helperPath();
         ghoul::Dictionary helpersDict;
         if (!helperPath.empty()) {
-            helpersDict.setValue("0", helperPath);
+            helpersDict.setValue("0", helperPath.string());
         }
         dict.setValue("helperPaths", helpersDict);
 
@@ -1042,8 +1062,8 @@ void FramebufferRenderer::updateDeferredcastData() {
         try {
             _deferredcastPrograms[caster] = ghoul::opengl::ProgramObject::Build(
                 "Deferred " + std::to_string(data.id) + " raycast",
-                absPath(vsPath),
-                absPath(deferredShaderPath),
+                vsPath,
+                deferredShaderPath,
                 dict
             );
 
@@ -1101,8 +1121,10 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO);
     global::renderEngine->openglStateCache().setDefaultFramebuffer(_defaultFBO);
 
-    GLint viewport[4] = { 0 };
-    global::renderEngine->openglStateCache().viewport(viewport);
+    GLint vp[4] = { 0 };
+    glGetIntegerv(GL_VIEWPORT, vp);
+    global::renderEngine->openglStateCache().setViewportState(vp);
+    glm::ivec4 viewport = glm::ivec4(vp[0], vp[1], vp[2], vp[3]);
 
     // Reset Render Pipeline State
     global::renderEngine->openglStateCache().resetCachedStates();
@@ -1118,9 +1140,6 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
         ZoneScopedN("Deferred G-Buffer")
         TracyGpuZone("Deferred G-Buffer")
 
-        GLint vp[4] = {viewport[0], viewport[1], _resolution.x, _resolution.y};
-        global::renderEngine->openglStateCache().setViewportState(vp);
-
         glBindFramebuffer(GL_FRAMEBUFFER, _gBuffers.framebuffer);
         glDrawBuffers(3, ColorAttachmentArray);
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -1163,20 +1182,20 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
     {
         TracyGpuZone("Raycaster Tasks")
         GLDebugGroup group("Raycaster Tasks");
-        performRaycasterTasks(tasks.raycasterTasks);
+        performRaycasterTasks(tasks.raycasterTasks, viewport);
     }
 
     if (!tasks.deferredcasterTasks.empty()) {
         TracyGpuZone("Deferred Caster Tasks")
         GLDebugGroup group("Deferred Caster Tasks");
 
-        // We use ping pong rendering in order to be able to
-        // render to the same final buffer, multiple
-        // deferred tasks at same time (e.g. more than 1 ATM being seen at once)
+        // We use ping pong rendering in order to be able to render multiple deferred
+        // tasks at same time (e.g. more than 1 ATM being seen at once) to the same final
+        // buffer
         glBindFramebuffer(GL_FRAMEBUFFER, _pingPongBuffers.framebuffer);
         glDrawBuffers(1, &ColorAttachmentArray[_pingPongIndex]);
 
-        performDeferredTasks(tasks.deferredcasterTasks);
+        performDeferredTasks(tasks.deferredcasterTasks, viewport);
     }
 
     glDrawBuffers(1, &ColorAttachmentArray[_pingPongIndex]);
@@ -1220,18 +1239,20 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
         TracyGpuZone("Apply TMO")
         GLDebugGroup group("Apply TMO");
 
-        applyTMO(blackoutFactor);
+        applyTMO(blackoutFactor, glm::ivec4(viewport[0], viewport[1], viewport[2], viewport[3]));
     }
 
     if (_enableFXAA) {
         TracyGpuZone("Apply FXAA")
         GLDebugGroup group("Apply FXAA");
         glBindFramebuffer(GL_FRAMEBUFFER, _defaultFBO);
-        applyFXAA();
+        applyFXAA(viewport);
     }
 }
 
-void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>& tasks) {
+void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>& tasks,
+                                                const glm::ivec4& viewport)
+{
     ZoneScoped
 
     for (const RaycasterTask& raycasterTask : tasks) {
@@ -1241,8 +1262,7 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
 
         glBindFramebuffer(GL_FRAMEBUFFER, _exitFramebuffer);
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        GLint viewport[4] = { 0 };
-        global::renderEngine->openglStateCache().viewport(viewport);
+        //global::renderEngine->openglStateCache().viewport(glm::value_ptr(viewport));
 
         ghoul::opengl::ProgramObject* exitProgram = _exitPrograms[raycaster].get();
         if (exitProgram) {
@@ -1255,10 +1275,10 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
             glBindFramebuffer(GL_FRAMEBUFFER, _downscaleVolumeRendering.framebuffer);
             const float s = raycaster->downscaleRender();
             GLint newVP[4] = {
-                viewport[0],
-                viewport[1],
-                static_cast<GLsizei>(viewport[2] * s),
-                static_cast<GLsizei>(viewport[3] * s)
+                static_cast<GLint>(viewport[0] * s),
+                static_cast<GLint>(viewport[1] * s),
+                static_cast<GLint>(viewport[2] * s),
+                static_cast<GLint>(viewport[3] * s)
             };
             global::renderEngine->openglStateCache().setViewportState(newVP);
 
@@ -1357,15 +1377,18 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
         }
 
         if (raycaster->downscaleRender() < 1.f) {
-            global::renderEngine->openglStateCache().setViewportState(viewport);
+            global::renderEngine->openglStateCache().setViewportState(
+                glm::value_ptr(viewport)
+            );
             glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _gBuffers.framebuffer);
-            writeDownscaledVolume();
+            writeDownscaledVolume(viewport);
         }
     }
 }
 
 void FramebufferRenderer::performDeferredTasks(
-                                             const std::vector<DeferredcasterTask>& tasks)
+                                             const std::vector<DeferredcasterTask>& tasks,
+                                                               const glm::ivec4& viewport)
 {
     ZoneScoped
 
@@ -1398,6 +1421,16 @@ void FramebufferRenderer::performDeferredTasks(
                 mainDColorTextureUnit
             );
 
+            deferredcastProgram->setUniform(
+                "viewport",
+                static_cast<float>(viewport[0]),
+                static_cast<float>(viewport[1]),
+                static_cast<float>(viewport[2]),
+                static_cast<float>(viewport[3])
+            );
+            deferredcastProgram->setUniform("resolution", glm::vec2(_resolution));
+
+
             ghoul::opengl::TextureUnit mainPositionTextureUnit;
             mainPositionTextureUnit.activate();
             glBindTexture(GL_TEXTURE_2D, _gBuffers.positionTexture);
diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp
index 43fa4fae94..cfa790b3d0 100644
--- a/src/rendering/helper.cpp
+++ b/src/rendering/helper.cpp
@@ -32,6 +32,7 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <algorithm>
+#include <filesystem>
 #include <fstream>
 #include <string>
 #include <vector>
@@ -40,11 +41,11 @@ namespace {
 
 bool isInitialized = false;
 
-std::string xyuvrgbaVertexFile;
-std::string xyuvrgbaFragmentFile;
+std::filesystem::path xyuvrgbaVertexFile;
+std::filesystem::path xyuvrgbaFragmentFile;
 
-std::string screenFillingVertexFile;
-std::string screenFillingFragmentFile;
+std::filesystem::path screenFillingVertexFile;
+std::filesystem::path screenFillingFragmentFile;
 
 constexpr const char* XyuvrgbaVertexCode = R"(
 #version __CONTEXT__
@@ -125,7 +126,6 @@ void main() {
 
 } // namespace
 
-#pragma optimize ("", off)
 namespace openspace::rendering::helper {
 
 namespace detail {
@@ -295,18 +295,18 @@ void deinitialize() {
     ghoul_assert(isInitialized, "Rendering Helper not initialized");
 
     if (!xyuvrgbaVertexFile.empty()) {
-        FileSys.deleteFile(xyuvrgbaVertexFile);
+        std::filesystem::remove(xyuvrgbaVertexFile);
     }
     if (!xyuvrgbaFragmentFile.empty()) {
-        FileSys.deleteFile(xyuvrgbaFragmentFile);
+        std::filesystem::remove(xyuvrgbaFragmentFile);
     }
     shaders.xyuvrgba.program = nullptr;
 
     if (!screenFillingVertexFile.empty()) {
-        FileSys.deleteFile(screenFillingVertexFile);
+        std::filesystem::remove(screenFillingVertexFile);
     }
     if (!screenFillingFragmentFile.empty()) {
-        FileSys.deleteFile(screenFillingVertexFile);
+        std::filesystem::remove(screenFillingVertexFile);
     }
     shaders.screenfilling.program = nullptr;
 
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 5e585d2d7b..fcb131de23 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -140,7 +140,7 @@ LoadingScreen::LoadingScreen(ShowMessage showMessage, ShowNodeNames showNodeName
     {
         // Logo stuff
         _logoTexture = ghoul::io::TextureReader::ref().loadTexture(
-            absPath("${DATA}/openspace-logo.png")
+            absPath("${DATA}/openspace-logo.png").string()
         );
         _logoTexture->uploadTexture();
     }
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index dfbfc483d5..2d953ac33b 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -38,6 +38,7 @@
 #include <ghoul/misc/profiling.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/programobject.h>
+#include <filesystem>
 #include <fstream>
 
 namespace {
@@ -169,13 +170,8 @@ LuaConsole::~LuaConsole() {} // NOLINT
 void LuaConsole::initialize() {
     ZoneScoped
 
-    const std::string filename = FileSys.cacheManager()->cachedFilename(
-        HistoryFile,
-        "",
-        ghoul::filesystem::CacheManager::Persistent::Yes
-    );
-
-    if (FileSys.fileExists(filename)) {
+    const std::string filename = FileSys.cacheManager()->cachedFilename(HistoryFile, "");
+    if (std::filesystem::is_regular_file(filename)) {
         std::ifstream file(filename, std::ios::binary | std::ios::in);
 
         if (file.good()) {
@@ -234,11 +230,7 @@ void LuaConsole::initialize() {
 void LuaConsole::deinitialize() {
     ZoneScoped
 
-    const std::string filename = FileSys.cacheManager()->cachedFilename(
-        HistoryFile,
-        "",
-        ghoul::filesystem::CacheManager::Persistent::Yes
-    );
+    const std::string filename = FileSys.cacheManager()->cachedFilename(HistoryFile, "");
 
     // We want to limit the command history to a realistic value, so that it doesn't
     // grow without bounds
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index b9c9f6459c..c9704ec821 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -78,9 +78,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation Renderable::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "renderable";
-    return doc;
+    return codegen::doc<Parameters>("renderable");
 }
 
 ghoul::mm_unique_ptr<Renderable> Renderable::createFromDictionary(
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index ff37ec8c07..7e1010aad5 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -48,12 +48,14 @@
 #include <openspace/util/updatestructures.h>
 #include <openspace/util/versionchecker.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/font/font.h>
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/io/texture/texturereadercmap.h>
 #include <ghoul/io/model/modelreader.h>
 #include <ghoul/io/model/modelreaderassimp.h>
+#include <ghoul/io/model/modelreaderbinary.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/misc/stringconversion.h>
@@ -251,7 +253,6 @@ namespace {
     };
 } // namespace
 
-
 namespace openspace {
 
 RenderEngine::RenderEngine()
@@ -371,9 +372,11 @@ RenderEngine::RenderEngine()
             char date[128];
             strftime(date, sizeof(date), "%Y-%m-%d-%H-%M", nowTime);
 
-            std::string newFolder = absPath("${STARTUP_SCREENSHOT}/" + std::string(date));
-            if (!FileSys.directoryExists(newFolder)) {
-                FileSys.createDirectory(newFolder);
+            std::filesystem::path newFolder = absPath(
+                "${STARTUP_SCREENSHOT}/" + std::string(date)
+            );
+            if (!std::filesystem::is_directory(newFolder)) {
+                std::filesystem::create_directory(newFolder);
             }
             FileSys.registerPathToken(
                 "${SCREENSHOTS}",
@@ -390,7 +393,7 @@ RenderEngine::RenderEngine()
                 ghoul::filesystem::FileSystem::Override::Yes
             );
         }
-        global::windowDelegate->setScreenshotFolder(absPath("${SCREENSHOTS}"));
+        global::windowDelegate->setScreenshotFolder(absPath("${SCREENSHOTS}").string());
     });
     addProperty(_screenshotUseDate);
 
@@ -478,6 +481,10 @@ void RenderEngine::initialize() {
         std::make_unique<ghoul::io::ModelReaderAssimp>()
     );
 
+    ghoul::io::ModelReader::ref().addReader(
+        std::make_unique<ghoul::io::ModelReaderBinary>()
+    );
+
     _versionString = OPENSPACE_VERSION_STRING_FULL;
     if (global::versionChecker->hasLatestVersionInfo()) {
         VersionChecker::SemanticVersion latest = global::versionChecker->latestVersion();
@@ -989,8 +996,8 @@ bool RenderEngine::isHdrDisabled() const {
  */
 std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
                                                                   const std::string& name,
-                                                                const std::string& vsPath,
-                                                                       std::string fsPath,
+                                                      const std::filesystem::path& vsPath,
+                                                             std::filesystem::path fsPath,
                                                                    ghoul::Dictionary data)
 {
     ghoul::Dictionary dict = std::move(data);
@@ -1000,7 +1007,7 @@ std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
     // parameterize the main fragment shader program with specific contents.
     // fsPath should point to a shader file defining a Fragment getFragment() function
     // instead of a void main() setting glFragColor, glFragDepth, etc.
-    dict.setValue("fragmentPath", std::move(fsPath));
+    dict.setValue("fragmentPath", fsPath.string());
 
     using namespace ghoul::opengl;
     std::unique_ptr<ProgramObject> program = ProgramObject::Build(
@@ -1021,9 +1028,9 @@ std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
 */
 std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
                                                                   const std::string& name,
-                                                                const std::string& vsPath,
-                                                                       std::string fsPath,
-                                                                const std::string& csPath,
+                                                      const std::filesystem::path& vsPath,
+                                                             std::filesystem::path fsPath,
+                                                      const std::filesystem::path& csPath,
                                                                    ghoul::Dictionary data)
 {
     ghoul::Dictionary dict = std::move(data);
@@ -1032,7 +1039,7 @@ std::unique_ptr<ghoul::opengl::ProgramObject> RenderEngine::buildRenderProgram(
     // parameterize the main fragment shader program with specific contents.
     // fsPath should point to a shader file defining a Fragment getFragment() function
     // instead of a void main() setting glFragColor, glFragDepth, etc.
-    dict.setValue("fragmentPath", std::move(fsPath));
+    dict.setValue("fragmentPath", fsPath.string());
 
     using namespace ghoul::opengl;
     std::unique_ptr<ProgramObject> program = ProgramObject::Build(
@@ -1101,11 +1108,8 @@ void RenderEngine::takeScreenshot() {
     // screenshot folder everytime we start OpenSpace even when we are not taking any
     // screenshots. So the first time we actually take one, we create the folder:
 
-    if (!FileSys.directoryExists(absPath("${SCREENSHOTS}"))) {
-        FileSys.createDirectory(
-            absPath("${SCREENSHOTS}"),
-            ghoul::filesystem::FileSystem::Recursive::Yes
-        );
+    if (!std::filesystem::is_directory(absPath("${SCREENSHOTS}"))) {
+        std::filesystem::create_directories(absPath("${SCREENSHOTS}"));
     }
 
     _latestScreenshotNumber = global::windowDelegate->takeScreenshot(_applyWarping);
@@ -1407,32 +1411,29 @@ void RenderEngine::renderScreenLog() {
 
     _log->removeExpiredEntries();
 
-    constexpr const int MaxNumberMessages = 20;
+    constexpr const size_t MaxNumberMessages = 20;
     constexpr const int CategoryLength = 30;
     constexpr const int MessageLength = 280;
     constexpr const std::chrono::seconds FadeTime(5);
 
     const std::vector<ScreenLog::LogEntry>& entries = _log->entries();
-    auto lastEntries =
-        entries.size() > MaxNumberMessages ?
-        std::make_pair(entries.rbegin(), entries.rbegin() + MaxNumberMessages) :
-        std::make_pair(entries.rbegin(), entries.rend());
-
     const glm::ivec2 fontRes = fontResolution();
 
-    size_t nr = 1;
+    size_t nRows = 1;
     const auto now = std::chrono::steady_clock::now();
-    for (auto& it = lastEntries.first; it != lastEntries.second; ++it) {
+    for (size_t i = 1; i <= std::min(MaxNumberMessages, entries.size()); i += 1) {
         ZoneScopedN("Entry")
 
-        std::chrono::duration<double> diff = now - it->timeStamp;
+        const ScreenLog::LogEntry& it = entries[entries.size() - i];
+
+        const std::chrono::duration<double> diff = now - it.timeStamp;
 
         float alpha = 1.f;
-        std::chrono::duration<double> ttf = ScreenLogTimeToLive - FadeTime;
+        const std::chrono::duration<double> ttf = ScreenLogTimeToLive - FadeTime;
         if (diff > ttf) {
-            double d = (diff - ttf).count();
-            float t = static_cast<float>(d) / static_cast<float>(FadeTime.count());
-            float p = 0.8f - t;
+            const double d = (diff - ttf).count();
+            const float t = static_cast<float>(d) / static_cast<float>(FadeTime.count());
+            const float p = 0.8f - t;
             alpha = (p <= 0.f) ? 0.f : pow(p, 0.4f);
         }
 
@@ -1440,8 +1441,8 @@ void RenderEngine::renderScreenLog() {
         if (alpha <= 0.f) {
             break;
         }
-        std::string_view message = std::string_view(it->message).substr(0, MessageLength);
-        nr += std::count(message.begin(), message.end(), '\n');
+        std::string_view message = std::string_view(it.message).substr(0, MessageLength);
+        nRows += std::count(message.begin(), message.end(), '\n');
 
         const glm::vec4 white(0.9f, 0.9f, 0.9f, alpha);
 
@@ -1451,9 +1452,9 @@ void RenderEngine::renderScreenLog() {
             char* end = fmt::format_to(
                 buf.data(),
                 "{:<15} {}{}",
-                it->timeString,
-                std::string_view(it->category).substr(0, CategoryLength),
-                it->category.length() > CategoryLength ? "..." : ""
+                it.timeString,
+                std::string_view(it.category).substr(0, CategoryLength),
+                it.category.length() > CategoryLength ? "..." : ""
             );
             std::string_view text = std::string_view(buf.data(), end - buf.data());
 
@@ -1461,7 +1462,7 @@ void RenderEngine::renderScreenLog() {
                 *_fontLog,
                 glm::vec2(
                     10.f,
-                    _fontLog->pointSize() * nr * 2 + fontRes.y * _verticalLogOffset
+                    _fontLog->pointSize() * nRows * 2 + fontRes.y * _verticalLogOffset
                 ),
                 text,
                 white
@@ -1482,9 +1483,9 @@ void RenderEngine::renderScreenLog() {
                     default:
                         return white;
                 }
-            }(it->level);
+            }(it.level);
 
-            const std::string_view lvl = ghoul::to_string(it->level);
+            const std::string_view lvl = ghoul::to_string(it.level);
             std::fill(buf.begin(), buf.end(), char(0));
             char* end = fmt::format_to(buf.data(), "({})", lvl);
             std::string_view levelText = std::string_view(buf.data(), end - buf.data());
@@ -1492,7 +1493,7 @@ void RenderEngine::renderScreenLog() {
                 *_fontLog,
                 glm::vec2(
                     10 + (30 + 3) * _fontLog->pointSize(),
-                    _fontLog->pointSize() * nr * 2 + fontRes.y * _verticalLogOffset
+                    _fontLog->pointSize() * nRows * 2 + fontRes.y * _verticalLogOffset
                 ),
                 levelText,
                 color
@@ -1503,12 +1504,12 @@ void RenderEngine::renderScreenLog() {
             *_fontLog,
             glm::vec2(
                 10 + 44 * _fontLog->pointSize(),
-                _fontLog->pointSize() * nr * 2 + fontRes.y * _verticalLogOffset
+                _fontLog->pointSize() * nRows * 2 + fontRes.y * _verticalLogOffset
             ),
             message,
             white
         );
-        ++nr;
+        ++nRows;
     }
 }
 
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index fa64370e68..ef0b3b2673 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -43,7 +43,7 @@
 
 namespace {
     constexpr const std::array<const char*, 4> UniformNames = {
-        "Alpha", "ModelTransform", "ViewProjectionMatrix", "texture1"
+        "color", "opacity", "mvpMatrix", "tex"
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
@@ -100,6 +100,12 @@ namespace {
         "An euler rotation (x, y, z) to apply to the plane."
     };
 
+    constexpr openspace::properties::Property::PropertyInfo MultiplyColorInfo = {
+        "MultiplyColor",
+        "Multiply Color",
+        "If set, the plane's texture is multiplied with this color. "
+        "Useful for applying a color grayscale images."
+    };
 
     constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
         "Opacity",
@@ -245,6 +251,9 @@ namespace {
         // [[codegen::verbatim(UsePerspectiveProjectionInfo.description)]]
         std::optional<bool> usePerspectiveProjection;
 
+        // [[codegen::verbatim(MultiplyColorInfo.description)]]
+        std::optional<glm::vec3> multiplyColor [[codegen::color()]];
+
         // [codegen::verbatim(OpacityInfo.description)]]
         std::optional<float> opacity [[codegen::inrange(0.f, 1.f)]];
 
@@ -259,9 +268,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation ScreenSpaceRenderable::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "core_screenspacerenderable";
-    return doc;
+    return codegen::doc<Parameters>("core_screenspacerenderable");
 }
 
 std::unique_ptr<ScreenSpaceRenderable> ScreenSpaceRenderable::createFromDictionary(
@@ -324,6 +331,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         glm::vec3(glm::pi<float>())
     )
     , _scale(ScaleInfo, 0.25f, 0.f, 2.f)
+    , _multiplyColor(MultiplyColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _opacity(OpacityInfo, 1.f, 0.f, 1.f)
     , _delete(DeleteInfo)
 {
@@ -355,9 +363,14 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
     });
 
     addProperty(_scale);
+    addProperty(_multiplyColor);
     addProperty(_opacity);
     addProperty(_localRotation);
 
+
+    _multiplyColor = p.multiplyColor.value_or(_multiplyColor);
+    _multiplyColor.setViewOption(properties::Property::ViewOptions::Color);
+
     _enabled = p.enabled.value_or(_enabled);
     _useRadiusAzimuthElevation =
         p.useRadiusAzimuthElevation.value_or(_useRadiusAzimuthElevation);
@@ -554,12 +567,11 @@ void ScreenSpaceRenderable::draw(glm::mat4 modelTransform) {
 
     _shader->activate();
 
-    _shader->setUniform(_uniformCache.alpha, _opacity);
-    _shader->setUniform(_uniformCache.modelTransform, modelTransform);
-
+    _shader->setUniform(_uniformCache.color, _multiplyColor);
+    _shader->setUniform(_uniformCache.opacity, _opacity);
     _shader->setUniform(
-        _uniformCache.viewProj,
-        global::renderEngine->scene()->camera()->viewProjectionMatrix()
+        _uniformCache.mvp,
+        global::renderEngine->scene()->camera()->viewProjectionMatrix() * modelTransform
     );
 
     ghoul::opengl::TextureUnit unit;
@@ -576,8 +588,6 @@ void ScreenSpaceRenderable::draw(glm::mat4 modelTransform) {
     unbindTexture();
 }
 
-void ScreenSpaceRenderable::unbindTexture() {
-}
-
+void ScreenSpaceRenderable::unbindTexture() {}
 
 } // namespace openspace
diff --git a/src/rendering/texturecomponent.cpp b/src/rendering/texturecomponent.cpp
index ce771887f8..a49200073a 100644
--- a/src/rendering/texturecomponent.cpp
+++ b/src/rendering/texturecomponent.cpp
@@ -77,23 +77,21 @@ void TextureComponent::uploadToGpu() {
     }
 }
 
-void TextureComponent::loadFromFile(const std::string& path) {
+void TextureComponent::loadFromFile(const std::filesystem::path& path) {
     if (!path.empty()) {
         using namespace ghoul::io;
         using namespace ghoul::opengl;
         std::unique_ptr<Texture> texture = TextureReader::ref().loadTexture(
-            absPath(path)
+            absPath(path.string()).string()
         );
 
         if (texture) {
-            LDEBUG(fmt::format("Loaded texture from '{}'", absPath(path)));
+            LDEBUG(fmt::format("Loaded texture from '{}'", absPath(path.string())));
             _texture = std::move(texture);
 
             _textureFile = std::make_unique<ghoul::filesystem::File>(path);
             if (_shouldWatchFile) {
-                _textureFile->setCallback(
-                    [&](const ghoul::filesystem::File&) { _fileIsDirty = true; }
-                );
+                _textureFile->setCallback([this]() { _fileIsDirty = true; });
             }
 
             _fileIsDirty = false;
diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp
index db342727d0..260a3985b8 100644
--- a/src/rendering/transferfunction.cpp
+++ b/src/rendering/transferfunction.cpp
@@ -32,27 +32,14 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/texture.h>
 #include <iterator>
+#include <filesystem>
 #include <fstream>
 #include <string>
 
 namespace {
     constexpr const char* _loggerCat = "TransferFunction";
-
-    // @TODO Replace with Filesystem::File extension
-    bool hasExtension(const std::string& filepath, const std::string& extension) {
-        std::string ending = "." + extension;
-        if (filepath.length() > ending.length()) {
-            return (0 == filepath.compare(
-                filepath.length() - ending.length(),
-                ending.length(), ending));
-        }
-        else {
-            return false;
-        }
-    }
 } // namespace
 
-
 namespace openspace {
 
 TransferFunction::TransferFunction(const std::string& filepath,
@@ -69,21 +56,16 @@ void TransferFunction::setPath(const std::string& filepath) {
     if (_file) {
         _file = nullptr;
     }
-    std::string f = absPath(filepath);
-    if (!FileSys.fileExists(f)) {
+    std::filesystem::path f = absPath(filepath);
+    if (!std::filesystem::is_regular_file(f)) {
         LERROR("Could not find transfer function file.");
         _file = nullptr;
         return;
     }
     _filepath = f;
-    _file = std::make_unique<ghoul::filesystem::File>(
-        _filepath,
-        ghoul::filesystem::File::RawPath::Yes
-    );
+    _file = std::make_unique<ghoul::filesystem::File>(_filepath);
     _needsUpdate = true;
-    _file->setCallback([this](const ghoul::filesystem::File&) {
-        _needsUpdate = true;
-    });
+    _file->setCallback([this]() { _needsUpdate = true; });
 }
 
 ghoul::opengl::Texture& TransferFunction::texture() {
@@ -94,7 +76,7 @@ ghoul::opengl::Texture& TransferFunction::texture() {
 
 void TransferFunction::update() {
     if (_needsUpdate) {
-        if (hasExtension(_filepath, "txt")) {
+        if (_filepath.extension() == ".txt") {
             setTextureFromTxt();
         }
         else {
@@ -114,10 +96,10 @@ void TransferFunction::setCallback(TfChangedCallback callback) {
 
 void TransferFunction::setTextureFromTxt() {
     std::ifstream in;
-    in.open(_filepath.c_str());
+    in.open(_filepath);
 
     if (!in.is_open()) {
-        throw ghoul::FileNotFoundError(_filepath);
+        throw ghoul::FileNotFoundError(_filepath.string());
     }
 
     int width = 512;
@@ -222,7 +204,7 @@ void TransferFunction::setTextureFromTxt() {
 }
 
 void TransferFunction::setTextureFromImage() {
-    _texture = ghoul::io::TextureReader::ref().loadTexture(_filepath);
+    _texture = ghoul::io::TextureReader::ref().loadTexture(_filepath.string());
     _texture->setWrapping(ghoul::opengl::Texture::WrappingMode::ClampToEdge);
 }
 
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index b264fc1e2a..dc03a46118 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -32,6 +32,7 @@
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
+#include <filesystem>
 #include <unordered_set>
 
 namespace openspace {
@@ -673,7 +674,7 @@ bool Asset::hasAssetFile() const {
 }
 
 std::string Asset::assetDirectory() const {
-    return ghoul::filesystem::File(_assetPath).directoryName();
+    return std::filesystem::path(_assetPath).parent_path().string();
 }
 
 const std::string& Asset::assetName() const {
diff --git a/src/scene/assetloader.cpp b/src/scene/assetloader.cpp
index 3e5c76be55..301070dad5 100644
--- a/src/scene/assetloader.cpp
+++ b/src/scene/assetloader.cpp
@@ -265,7 +265,7 @@ bool AssetLoader::loadAsset(Asset* asset) {
         setCurrentAsset(parentAsset);
     };
 
-    if (!FileSys.fileExists(asset->assetFilePath())) {
+    if (!std::filesystem::is_regular_file(asset->assetFilePath())) {
         LERROR(fmt::format(
             "Could not load asset '{}': File does not exist", asset->assetFilePath())
         );
@@ -387,10 +387,10 @@ std::string AssetLoader::generateAssetPath(const std::string& baseDirectory,
     PathType pathType = classifyPath(assetPath);
     std::string prefix;
     if (pathType == PathType::RelativeToAsset) {
-        prefix = baseDirectory + ghoul::filesystem::FileSystem::PathSeparator;
+        prefix = baseDirectory + '/';
     }
     else if (pathType == PathType::RelativeToAssetRoot) {
-        prefix = _assetRootDirectory + ghoul::filesystem::FileSystem::PathSeparator;
+        prefix = _assetRootDirectory + '/';
     }
 
     // Construct the full path including the .asset extension
@@ -400,12 +400,12 @@ std::string AssetLoader::generateAssetPath(const std::string& baseDirectory,
         (assetPath.substr(assetPath.size() - assetSuffix.size()) == assetSuffix);
     std::string fullAssetPath =
         (pathType == PathType::Tokenized) ?
-        absPath(assetPath) :
+        absPath(assetPath).string() :
         prefix + assetPath;
     if (!hasAssetSuffix) {
         fullAssetPath += assetSuffix;
     }
-    bool fullAssetPathExists = FileSys.fileExists(FileSys.absPath(fullAssetPath));
+    bool fullAssetPathExists = std::filesystem::is_regular_file(absPath(fullAssetPath));
 
     // Construct the full path including the .scene extension
     const std::string sceneSuffix = std::string(".") + SceneFileSuffix;
@@ -416,7 +416,8 @@ std::string AssetLoader::generateAssetPath(const std::string& baseDirectory,
         hasSceneSuffix ?
         prefix + assetPath :
         prefix + assetPath + sceneSuffix;
-    const bool fullScenePathExists = FileSys.fileExists(FileSys.absPath(fullScenePath));
+    const bool fullScenePathExists =
+        std::filesystem::is_regular_file(absPath(fullScenePath));
 
     if (fullAssetPathExists && fullScenePathExists) {
         LWARNING(fmt::format(
@@ -425,21 +426,21 @@ std::string AssetLoader::generateAssetPath(const std::string& baseDirectory,
             fullAssetPath, fullScenePath, prefix + assetPath, fullAssetPath
         ));
 
-        return FileSys.absPath(fullAssetPath);
+        return absPath(fullAssetPath).string();
     }
 
     if (fullScenePathExists) {
-        return FileSys.absPath(fullScenePath);
+        return absPath(fullScenePath).string();
     }
 
     // We don't check whether the file exists here as the error will be more
     // comprehensively logged by Lua either way
-    return FileSys.absPath(fullAssetPath);
+    return absPath(fullAssetPath).string();
 }
 
 std::shared_ptr<Asset> AssetLoader::getAsset(const std::string& name) {
-    ghoul::filesystem::Directory directory = currentDirectory();
-    const std::string path = generateAssetPath(directory, name);
+    std::filesystem::path directory = currentDirectory();
+    const std::string path = generateAssetPath(directory.string(), name);
 
     // Check if asset is already loaded.
     const auto it = _trackedAssets.find(path);
@@ -452,7 +453,7 @@ std::shared_ptr<Asset> AssetLoader::getAsset(const std::string& name) {
 
     std::shared_ptr<Asset> asset = std::make_shared<Asset>(
         this,
-       _synchronizationWatcher,
+        _synchronizationWatcher,
         path
     );
 
@@ -507,7 +508,7 @@ void AssetLoader::unrequest(const std::string& identifier) {
     assetUnrequested(parent, asset);
 }
 
-ghoul::filesystem::Directory AssetLoader::currentDirectory() const {
+std::filesystem::path AssetLoader::currentDirectory() const {
     if (_currentAsset->hasAssetFile()) {
         return _currentAsset->assetDirectory();
     }
@@ -535,8 +536,8 @@ void AssetLoader::remove(const std::string& identifier) {
 }
 
 std::shared_ptr<Asset> AssetLoader::has(const std::string& identifier) const {
-    ghoul::filesystem::Directory directory = currentDirectory();
-    std::string path = generateAssetPath(directory, identifier);
+    std::filesystem::path directory = currentDirectory();
+    std::string path = generateAssetPath(directory.string(), identifier);
 
     const auto it = _trackedAssets.find(path);
     if (it == _trackedAssets.end()) {
@@ -641,8 +642,7 @@ int AssetLoader::localResourceLua(Asset* asset) {
         ghoul::lua::PopValue::Yes
     );
 
-    const std::string resolvedName =
-        asset->assetDirectory() + ghoul::filesystem::FileSystem::PathSeparator + name;
+    const std::string resolvedName = fmt::format("{}/{}", asset->assetDirectory(), name);
 
     lua_pushstring(*_luaState, resolvedName.c_str());
 
@@ -742,11 +742,11 @@ int AssetLoader::existsLua(Asset*) {
 
     const std::string assetName = luaL_checkstring(*_luaState, 1);
 
-    const ghoul::filesystem::Directory directory = currentDirectory();
-    const std::string path = generateAssetPath(directory, assetName);
+    const std::filesystem::path directory = currentDirectory();
+    const std::string path = generateAssetPath(directory.string(), assetName);
 
     lua_settop(*_luaState, 0);
-    lua_pushboolean(*_luaState, FileSys.fileExists(path));
+    lua_pushboolean(*_luaState, std::filesystem::is_regular_file(path));
     ghoul_assert(lua_gettop(*_luaState) == 1, "Incorrect number of items left on stack");
     return 1;
 }
diff --git a/src/scene/lightsource.cpp b/src/scene/lightsource.cpp
index 597cff1265..4977e67c35 100644
--- a/src/scene/lightsource.cpp
+++ b/src/scene/lightsource.cpp
@@ -63,9 +63,7 @@ bool LightSource::isEnabled() const {
 }
 
 documentation::Documentation LightSource::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "core_light_source";
-    return doc;
+    return codegen::doc<Parameters>("core_light_source");
 }
 
 std::unique_ptr<LightSource> LightSource::createFromDictionary(
diff --git a/src/scene/profile_lua.inl b/src/scene/profile_lua.inl
index 385b26b0f8..02a5ea1bb4 100644
--- a/src/scene/profile_lua.inl
+++ b/src/scene/profile_lua.inl
@@ -51,8 +51,6 @@ int saveSettingsToProfile(lua_State* L) {
 
     std::string saveFilePath;
     if (n == 0) {
-        const ghoul::filesystem::File f = global::configuration->profile;
-
         std::time_t t = std::time(nullptr);
         std::tm* utcTime = std::gmtime(&t);
         ghoul_assert(utcTime, "Conversion to UTC failed");
@@ -66,13 +64,15 @@ int saveSettingsToProfile(lua_State* L) {
             utcTime->tm_min,
             utcTime->tm_sec
         );
-        std::string newFile = fmt::format("{}_{}", f.fullBaseName(), time);
+        std::filesystem::path path = global::configuration->profile;
+        path.replace_extension();
+        std::string newFile = fmt::format("{}_{}", path.string(), time);
         std::string sourcePath = fmt::format("{}/{}.profile",
-            absPath("${USER_PROFILES}"), global::configuration->profile);
+            absPath("${USER_PROFILES}").string(), global::configuration->profile);
         std::string destPath = fmt::format("{}/{}.profile",
-            absPath("${PROFILES}"), global::configuration->profile);
-        if (!FileSys.fileExists(sourcePath)) {
-            sourcePath = absPath("${USER_PROFILES}")
+            absPath("${PROFILES}").string(), global::configuration->profile);
+        if (!std::filesystem::is_regular_file(sourcePath)) {
+            sourcePath = absPath("${USER_PROFILES}").string()
                 + '/' + global::configuration->profile + ".profile";
         }
         LINFOC("Profile", fmt::format("Saving a copy of the old profile as {}", newFile));
@@ -104,13 +104,13 @@ int saveSettingsToProfile(lua_State* L) {
     }
 
     std::string absFilename = fmt::format("{}/{}.profile",
-        absPath("${PROFILES}"), saveFilePath);
-    if (!FileSys.fileExists(absFilename)) {
-        absFilename = absPath("${USER_PROFILES}/" + saveFilePath + ".profile");
+        absPath("${PROFILES}").string(), saveFilePath);
+    if (!std::filesystem::is_regular_file(absFilename)) {
+        absFilename = absPath("${USER_PROFILES}/" + saveFilePath + ".profile").string();
     }
     const bool overwrite = (n == 2) ? ghoul::lua::value<bool>(L, 2) : true;
 
-    if (FileSys.fileExists(absFilename) && !overwrite) {
+    if (std::filesystem::is_regular_file(absFilename) && !overwrite) {
         return luaL_error(
             L,
             fmt::format(
diff --git a/src/scene/rotation.cpp b/src/scene/rotation.cpp
index 637b60029e..bd11317587 100644
--- a/src/scene/rotation.cpp
+++ b/src/scene/rotation.cpp
@@ -48,9 +48,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation Rotation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "core_transform_rotation";
-    return doc;
+    return codegen::doc<Parameters>("core_transform_rotation");
 }
 
 ghoul::mm_unique_ptr<Rotation> Rotation::createFromDictionary(
diff --git a/src/scene/scale.cpp b/src/scene/scale.cpp
index b22af536a8..7b0c88c3e8 100644
--- a/src/scene/scale.cpp
+++ b/src/scene/scale.cpp
@@ -35,41 +35,29 @@
 #include <ghoul/misc/templatefactory.h>
 
 namespace {
-    constexpr const char* KeyType = "Type";
+    struct [[codegen::Dictionary(Scale)]] Parameters {
+        // The type of the scaling that is described in this element. The available types
+        // of scaling depend on the configuration of the application and can be written to
+        // disk on application startup into the FactoryDocumentation
+        std::string type [[codegen::annotation("Must name a valid Scale type")]];
+    };
+#include "scale_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation Scale::Documentation() {
-    using namespace openspace::documentation;
-
-    return {
-        "Transformation Scaling",
-        "core_transform_scaling",
-        {
-            {
-                KeyType,
-                new StringAnnotationVerifier("Must name a valid Scale type"),
-                Optional::No,
-                "The type of the scaling that is described in this element. "
-                "The available types of scaling depend on the configuration "
-                "of the application and can be written to disk on "
-                "application startup into the FactoryDocumentation."
-            }
-        }
-    };
+    return codegen::doc<Parameters>("core_transform_scaling");
 }
 
 ghoul::mm_unique_ptr<Scale> Scale::createFromDictionary(
                                                       const ghoul::Dictionary& dictionary)
 {
-    documentation::testSpecificationAndThrow(Documentation(), dictionary, "Scale");
-
-    std::string scaleType = dictionary.value<std::string>(KeyType);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     auto factory = FactoryManager::ref().factory<Scale>();
     Scale* result = factory->create(
-        scaleType,
+        p.type,
         dictionary,
         &global::memoryManager->PersistentMemory
     );
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 0e0ff31093..d39208d1a1 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -27,6 +27,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/windowdelegate.h>
+#include <openspace/interaction/sessionrecording.h>
 #include <openspace/query/query.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
@@ -495,9 +496,14 @@ void Scene::addPropertyInterpolation(properties::Property* prop, float durationS
         ghoul::easingFunction<float>(easingFunction);
 
     // First check if the current property already has an interpolation information
+    std::chrono::steady_clock::time_point now = (
+        global::sessionRecording->isSavingFramesDuringPlayback()     ?
+        global::sessionRecording->currentPlaybackInterpolationTime() :
+        std::chrono::steady_clock::now()
+    );
     for (PropertyInterpolationInfo& info : _propertyInterpolationInfos) {
         if (info.prop == prop) {
-            info.beginTime = std::chrono::steady_clock::now();
+            info.beginTime = now;
             info.durationSeconds = durationSeconds;
             info.easingFunction = func;
             // If we found it, we can break since we make sure that each property is only
@@ -508,7 +514,7 @@ void Scene::addPropertyInterpolation(properties::Property* prop, float durationS
 
     PropertyInterpolationInfo i = {
         prop,
-        std::chrono::steady_clock::now(),
+        now,
         durationSeconds,
         func
     };
@@ -544,8 +550,13 @@ void Scene::updateInterpolations() {
 
     using namespace std::chrono;
 
-    auto now = steady_clock::now();
-
+    steady_clock::time_point now;
+    if (global::sessionRecording->isSavingFramesDuringPlayback()) {
+        now = global::sessionRecording->currentPlaybackInterpolationTime();
+    }
+    else {
+        now = steady_clock::now();
+    }
     // First, let's update the properties
     for (PropertyInterpolationInfo& i : _propertyInterpolationInfos) {
         long long usPassed = duration_cast<std::chrono::microseconds>(
@@ -706,6 +717,20 @@ scripting::LuaLibrary Scene::luaLibrary() {
                 "Adds an interesting time to the current scene. The first argument is "
                 "the name of the time and the second argument is the time itself in the "
                 "format YYYY-MM-DDThh:mm:ss.uuu"
+            },
+            {
+                "worldPosition",
+                &luascriptfunctions::worldPosition,
+                {},
+                "string",
+                "Returns the world position of the scene graph node with the given string as identifier"
+            },
+            {
+                "worldRotation",
+                & luascriptfunctions::worldRotation,
+                {},
+                "string",
+                "Returns the world rotation matrix of the scene graph node with the given string as identifier"
             }
         }
     };
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index ca45fad370..cb1d33fd52 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -194,6 +194,9 @@ void applyRegularExpression(lua_State* L, const std::string& regex,
             // value change if the types agree
             foundMatching = true;
 
+            if (global::sessionRecording->isRecording()) {
+                global::sessionRecording->savePropertyBaseline(*prop);
+            }
             if (interpolationDuration == 0.0) {
                 global::renderEngine->scene()->removePropertyInterpolation(prop);
                 prop->setLuaValue(L);
@@ -265,6 +268,9 @@ int setPropertyCall_single(properties::Property& prop, const std::string& uri,
         );
     }
     else {
+        if (global::sessionRecording->isRecording()) {
+            global::sessionRecording->savePropertyBaseline(prop);
+        }
         if (duration == 0.0) {
             global::renderEngine->scene()->removePropertyInterpolation(&prop);
             prop.setLuaValue(L);
@@ -902,4 +908,44 @@ int addInterestingTime(lua_State* L) {
     return 0;
 }
 
+int worldPosition(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::worldPosition");
+
+    std::string identifier = ghoul::lua::value<std::string>(L, 1, ghoul::lua::PopValue::Yes);
+    SceneGraphNode* node = sceneGraphNode(identifier);
+
+    if (!node) {
+        return ghoul::lua::luaError(
+            L,
+            fmt::format("Did not find a match for identifier: {} ", identifier)
+        );
+    }
+
+    glm::dvec3 pos = node->worldPosition();
+    ghoul::lua::push(L, pos);
+
+    ghoul_assert(lua_gettop(L) == 1, "Incorrect number of items left on stack");
+    return 1;
+}
+
+int worldRotation(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::worldRotation");
+
+    std::string identifier = ghoul::lua::value<std::string>(L, 1, ghoul::lua::PopValue::Yes);
+    SceneGraphNode* node = sceneGraphNode(identifier);
+
+    if (!node) {
+        return ghoul::lua::luaError(
+            L,
+            fmt::format("Did not find a match for identifier: {} ", identifier)
+        );
+    }
+
+    glm::dmat3 rot = node->worldRotationMatrix();
+    ghoul::lua::push(L, rot);
+
+    ghoul_assert(lua_gettop(L) == 1, "Incorrect number of items left on stack");
+    return 1;
+}
+
 }  // namespace openspace::luascriptfunctions
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 2a44f4a5bd..0611b4cdd1 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -306,7 +306,6 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
             LDEBUG(fmt::format(
                 "Successfully created ephemeris for '{}'", result->identifier()
             ));
-            result->addPropertySubOwner(result->_transform.translation.get());
         }
 
         if (p.transform->rotation.has_value()) {
@@ -326,7 +325,6 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
             LDEBUG(fmt::format(
                 "Successfully created rotation for '{}'", result->identifier()
             ));
-            result->addPropertySubOwner(result->_transform.rotation.get());
         }
 
         if (p.transform->scale.has_value()) {
@@ -344,9 +342,12 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
             LDEBUG(fmt::format(
                 "Successfully created scale for '{}'", result->identifier()
             ));
-            result->addPropertySubOwner(result->_transform.scale.get());
         }
     }
+    result->addPropertySubOwner(result->_transform.translation.get());
+    result->addPropertySubOwner(result->_transform.rotation.get());
+    result->addPropertySubOwner(result->_transform.scale.get());
+
 
     if (p.timeFrame.has_value()) {
         result->_timeFrame = TimeFrame::createFromDictionary(*p.timeFrame);
@@ -400,9 +401,7 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
 }
 
 documentation::Documentation SceneGraphNode::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "core_scene_node";
-    return doc;
+    return codegen::doc<Parameters>("core_scene_node");
 }
 
 ghoul::opengl::ProgramObject* SceneGraphNode::_debugSphereProgram = nullptr;
@@ -425,7 +424,7 @@ SceneGraphNode::SceneGraphNode()
         )
     }
     , _boundingSphere(BoundingSphereInfo, -1.0, -1.0, 1e12)
-    , _interactionSphere(InteractionSphereInfo, -1.0, -1.0, -1.0, 1e12)
+    , _interactionSphere(InteractionSphereInfo, -1.0, -1.0, 1e12)
     , _computeScreenSpaceValues(ComputeScreenSpaceInfo, false)
     , _screenSpacePosition(ScreenSpacePositionInfo, glm::ivec2(-1, -1))
     , _screenVisibility(ScreenVisibilityInfo, false)
@@ -448,6 +447,7 @@ SceneGraphNode::SceneGraphNode()
             _overrideBoundingSphere = std::nullopt;
         }
     });
+    _boundingSphere.setExponent(10.f);
     addProperty(_boundingSphere);
     _interactionSphere.onChange([this]() {
         if (_interactionSphere >= 0.0) {
@@ -457,6 +457,7 @@ SceneGraphNode::SceneGraphNode()
             _overrideInteractionSphere = std::nullopt;
         }
         });
+    _interactionSphere.setExponent(10.f);
     addProperty(_interactionSphere);
     addProperty(_showDebugSphere);
 }
diff --git a/src/scene/scenelicensewriter.cpp b/src/scene/scenelicensewriter.cpp
index e93946ae41..ef7f4841b9 100644
--- a/src/scene/scenelicensewriter.cpp
+++ b/src/scene/scenelicensewriter.cpp
@@ -28,6 +28,7 @@
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/scene/asset.h>
 #include <openspace/scene/assetmanager.h>
+#include <openspace/util/json_helper.h>
 #include <ghoul/fmt.h>
 #include <ghoul/misc/profiling.h>
 #include <sstream>
diff --git a/src/scene/timeframe.cpp b/src/scene/timeframe.cpp
index 5ecebb4f62..5df9d91022 100644
--- a/src/scene/timeframe.cpp
+++ b/src/scene/timeframe.cpp
@@ -35,44 +35,28 @@
 #include <ghoul/misc/templatefactory.h>
 
 namespace {
-    constexpr const char* KeyType = "Type";
+    struct [[codegen::Dictionary(TimeFrame)]] Parameters {
+        // The type of the time frame that is described in this element. The available
+        // types of scaling depend on the configuration of the application and can be
+        // written to disk on application startup into the FactoryDocumentation
+        std::string type [[codegen::annotation("Must name a valid TimeFrame type")]];
+    };
+#include "timeframe_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation TimeFrame::Documentation() {
-    using namespace openspace::documentation;
-
-    return {
-        "Time Frame",
-        "core_time_frame",
-        {
-            {
-                KeyType,
-                new StringAnnotationVerifier("Must name a valid TimeFrame type"),
-                Optional::No,
-                "The type of the time frame that is described in this element. "
-                "The available types of scaling depend on the configuration "
-                "of the application and can be written to disk on "
-                "application startup into the FactoryDocumentation."
-            }
-        }
-    };
+    return codegen::doc<Parameters>("core_time_frame");
 }
 
 ghoul::mm_unique_ptr<TimeFrame> TimeFrame::createFromDictionary(
                                                       const ghoul::Dictionary& dictionary)
 {
-    documentation::testSpecificationAndThrow(Documentation(), dictionary, "TimeFrame");
-
-    const std::string timeFrameType = dictionary.value<std::string>(KeyType);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     auto factory = FactoryManager::ref().factory<TimeFrame>();
-    TimeFrame* result = factory->create(
-        timeFrameType,
-        dictionary/*,
-        &global::memoryManager.PersistentMemory*/
-    );
+    TimeFrame* result = factory->create(p.type, dictionary);
     result->setIdentifier("TimeFrame");
     return ghoul::mm_unique_ptr<TimeFrame>(result);
 }
diff --git a/src/scene/translation.cpp b/src/scene/translation.cpp
index 878270f827..7a723f9c5e 100644
--- a/src/scene/translation.cpp
+++ b/src/scene/translation.cpp
@@ -46,9 +46,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation Translation::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "core_transform_translation";
-    return doc;
+    return codegen::doc<Parameters>("core_transform_translation");
 }
 
 ghoul::mm_unique_ptr<Translation> Translation::createFromDictionary(
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 7ea69ac42d..b7c6b6541d 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -28,11 +28,13 @@
 #include <openspace/engine/globals.h>
 #include <openspace/interaction/sessionrecording.h>
 #include <openspace/network/parallelpeer.h>
+#include <openspace/util/json_helper.h>
 #include <openspace/util/syncbuffer.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/lua_helper.h>
 #include <ghoul/misc/profiling.h>
+#include <filesystem>
 #include <fstream>
 
 #include "scriptengine_lua.inl"
@@ -142,7 +144,7 @@ void ScriptEngine::addLibrary(LuaLibrary library) {
             }
         }
 
-        for (const std::string& script : library.scripts) {
+        for (const std::filesystem::path& script : library.scripts) {
             merged.scripts.push_back(script);
         }
 
@@ -189,14 +191,23 @@ bool ScriptEngine::runScript(const std::string& script, ScriptCallback callback)
     }
     catch (const ghoul::lua::LuaLoadingException& e) {
         LERRORC(e.component, e.message);
+        if (callback) {
+            callback(ghoul::Dictionary());
+        }
         return false;
     }
     catch (const ghoul::lua::LuaExecutionException& e) {
         LERRORC(e.component, e.message);
+        if (callback) {
+            callback(ghoul::Dictionary());
+        }
         return false;
     }
     catch (const ghoul::RuntimeError& e) {
         LERRORC(e.component, e.message);
+        if (callback) {
+            callback(ghoul::Dictionary());
+        }
         return false;
     }
 
@@ -210,7 +221,7 @@ bool ScriptEngine::runScriptFile(const std::string& filename) {
         LWARNING("Filename was empty");
         return false;
     }
-    if (!FileSys.fileExists(filename)) {
+    if (!std::filesystem::is_regular_file(filename)) {
         LERROR(fmt::format("Script with name '{}' did not exist", filename));
         return false;
     }
@@ -307,9 +318,9 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
         lua_settable(state, TableOffset);
     }
 
-    for (const std::string& script : library.scripts) {
+    for (const std::filesystem::path& script : library.scripts) {
         // First we run the script to set its values in the current state
-        ghoul::lua::runScriptFile(state, script);
+        ghoul::lua::runScriptFile(state, script.string());
 
         library.documentations.clear();
 
@@ -318,7 +329,7 @@ void ScriptEngine::addLibraryFunctions(lua_State* state, LuaLibrary& library,
         lua_gettable(state, -2);
         if (lua_isnil(state, -1)) {
             LERROR(fmt::format(
-                "Module '{}' did not provide a documentation in script file '{}'",
+                "Module '{}' did not provide a documentation in script file {}",
                 library.name, script
             ));
         }
@@ -635,7 +646,7 @@ bool ScriptEngine::writeLog(const std::string& script) {
     if (!_logFileExists) {
         // If a ScriptLogFile was specified, generate it now
         if (!global::configuration->scriptLog.empty()) {
-            _logFilename = absPath(global::configuration->scriptLog);
+            _logFilename = absPath(global::configuration->scriptLog).string();
             _logFileExists = true;
 
             LDEBUG(fmt::format(
@@ -694,7 +705,7 @@ void ScriptEngine::preSync(bool isMaster) {
             global::parallelPeer->sendScript(item.script);
         }
         if (global::sessionRecording->isRecording()) {
-            global::sessionRecording->saveScriptKeyframe(item.script);
+            global::sessionRecording->saveScriptKeyframeToTimeline(item.script);
         }
     }
 }
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index d221232ca6..8d550bbeca 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -22,69 +22,13 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <ghoul/filesystem/directory.h>
 #include <ghoul/filesystem/file.h>
+#include <filesystem>
 
 #include <ghoul/ext/assimp/contrib/zip/src/zip.h>
 
 namespace openspace::luascriptfunctions {
 
-namespace {
-
-// Defining a common walk function that works off a pointer-to-member function
-template <typename Func>
-int walkCommon(lua_State* L, Func func) {
-    int nArguments = ghoul::lua::checkArgumentsAndThrow(L, { 1, 3 }, "lua::walkCommon");
-
-    std::string path = ghoul::lua::value<std::string>(L, 1);
-
-    std::vector<std::string> result;
-    if (nArguments == 1) {
-        // Only the path was passed
-        result = std::invoke(
-            func,
-            ghoul::filesystem::Directory(path),
-            ghoul::filesystem::Directory::Recursive::No,
-            ghoul::filesystem::Directory::Sort::No
-        );
-    }
-    else if (nArguments == 2) {
-        // The path and the recursive value were passed
-        const bool recursive = ghoul::lua::value<bool>(L, 2);
-        result = std::invoke(
-            func,
-            ghoul::filesystem::Directory(path),
-            ghoul::filesystem::Directory::Recursive(recursive),
-            ghoul::filesystem::Directory::Sort::No
-        );
-    }
-    else if (nArguments == 3) {
-        // All three arguments were passed
-        const bool recursive = ghoul::lua::value<bool>(L, 2);
-        const bool sorted = ghoul::lua::value<bool>(L, 3);
-        result = std::invoke(
-            func,
-            ghoul::filesystem::Directory(path),
-            ghoul::filesystem::Directory::Recursive(recursive),
-            ghoul::filesystem::Directory::Sort(sorted)
-        );
-    }
-
-    lua_settop(L, 0);
-
-    // Copy values into the lua_State
-    lua_newtable(L);
-
-    for (int i = 0; i < static_cast<int>(result.size()); ++i) {
-        lua_pushstring(L, result[i].c_str());
-        lua_rawseti(L, -2, i + 1);
-    }
-
-    ghoul_assert(lua_gettop(L) == 1, "Incorrect number of items left on stack");
-    return 1;
-}
-} // namespace
-
 int printInternal(ghoul::logging::LogLevel level, lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::printInternal");
 
@@ -203,7 +147,7 @@ int absolutePath(lua_State* L) {
         ghoul::lua::PopValue::Yes
     );
 
-    ghoul::lua::push(L, absPath(path));
+    ghoul::lua::push(L, absPath(path).string());
 
     ghoul_assert(lua_gettop(L) == 1, "Incorrect number of items left on stack");
     return 1;
@@ -245,7 +189,7 @@ int fileExists(lua_State* L) {
         1,
         ghoul::lua::PopValue::Yes
     );
-    const bool e = FileSys.fileExists(absPath(file));
+    const bool e = std::filesystem::is_regular_file(absPath(file));
 
     ghoul::lua::push(L, e);
 
@@ -266,7 +210,7 @@ int directoryExists(lua_State* L) {
         1,
         ghoul::lua::PopValue::Yes
     );
-    const bool e = FileSys.directoryExists(absPath(file));
+    const bool e = std::filesystem::is_directory(absPath(file));
 
     ghoul::lua::push(L, e);
 
@@ -274,6 +218,45 @@ int directoryExists(lua_State* L) {
     return 1;
 }
 
+int walkCommon(lua_State* L, std::function<bool(const std::filesystem::path&)> filter) {
+    int nArguments = ghoul::lua::checkArgumentsAndThrow(L, { 1, 3 }, "lua::walkCommon");
+
+    const std::string path = ghoul::lua::value<std::string>(L, 1);
+    const bool recursive = nArguments >= 2 ? ghoul::lua::value<bool>(L, 2) : false;
+    const bool sorted = nArguments == 3 ? ghoul::lua::value<bool>(L, 3) : false;
+
+    namespace fs = std::filesystem;
+    std::vector<fs::directory_entry> result;
+    if (fs::is_directory(path)) {
+        if (recursive) {
+            for (fs::directory_entry e : fs::recursive_directory_iterator(path)) {
+                if (filter(e)) {
+                    result.push_back(e);
+                }
+            }
+        }
+        else {
+            for (fs::directory_entry e : fs::directory_iterator(path)) {
+                if (filter(e)) {
+                    result.push_back(e);
+                }
+            }
+        }
+
+        if (sorted) {
+            std::sort(result.begin(), result.end());
+        }
+    }
+
+    lua_newtable(L);
+
+    for (int i = 0; i < static_cast<int>(result.size()); ++i) {
+        lua_pushstring(L, result[i].path().string().c_str());
+        lua_rawseti(L, -2, i + 1);
+    }
+    return 1;
+}
+
 /**
  * \ingroup LuaScripts
  * walkDirectory(string, bool, bool):
@@ -284,7 +267,11 @@ int directoryExists(lua_State* L) {
  * table that is returned is sorted. The default value for this parameter is "false".
  */
 int walkDirectory(lua_State* L) {
-    return walkCommon(L, &ghoul::filesystem::Directory::read);
+    namespace fs = std::filesystem;
+    return walkCommon(
+        L,
+        [](const fs::path& p) { return fs::is_directory(p) || fs::is_regular_file(p); }
+    );
 }
 
 /**
@@ -297,8 +284,8 @@ int walkDirectory(lua_State* L) {
  * table that is returned is sorted. The default value for this parameter is "false".
  */
 int walkDirectoryFiles(lua_State* L) {
-    return walkCommon(L, &ghoul::filesystem::Directory::readFiles);
-
+    namespace fs = std::filesystem;
+    return walkCommon(L, [](const fs::path& p) { return fs::is_regular_file(p); });
 }
 
 /**
@@ -311,10 +298,10 @@ int walkDirectoryFiles(lua_State* L) {
 * table that is returned is sorted. The default value for this parameter is "false".
 */
 int walkDirectoryFolder(lua_State* L) {
-    return walkCommon(L, &ghoul::filesystem::Directory::readDirectories);
+    namespace fs = std::filesystem;
+    return walkCommon(L, [](const fs::path& p) { return fs::is_directory(p); });
 }
 
-
 /**
  * \ingroup LuaScripts
  * directoryForPath(string):
@@ -325,12 +312,8 @@ int walkDirectoryFolder(lua_State* L) {
 int directoryForPath(lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::directoryForPath");
 
-    std::string file = ghoul::lua::value<std::string>(
-        L,
-        1,
-        ghoul::lua::PopValue::Yes
-    );
-    std::string path = ghoul::filesystem::File(std::move(file)).directoryName();
+    std::string file = ghoul::lua::value<std::string>(L, 1, ghoul::lua::PopValue::Yes);
+    std::string path = std::filesystem::path(std::move(file)).parent_path().string();
 
     ghoul::lua::push(L, path);
 
@@ -353,10 +336,10 @@ int unzipFile(lua_State* L) {
         "lua::unzipFile"
     );
 
-    std::string source = absPath(
+    std::filesystem::path source = absPath(
         ghoul::lua::value<std::string>(L, 1, ghoul::lua::PopValue::No)
     );
-    std::string dest = absPath(
+    std::filesystem::path dest = absPath(
         ghoul::lua::value<std::string>(L, 2, ghoul::lua::PopValue::No)
     );
 
@@ -367,10 +350,10 @@ int unzipFile(lua_State* L) {
 
     auto onExtractEntry = [](const char*, void*) { return 0; };
     int arg = 2;
-    zip_extract(source.c_str(), dest.c_str(), onExtractEntry, &arg);
+    zip_extract(source.string().c_str(), dest.string().c_str(), onExtractEntry, &arg);
 
-    if (deleteSource) {
-        FileSys.deleteFile(source);
+    if (deleteSource && std::filesystem::is_regular_file(source)) {
+        std::filesystem::remove(source);
     }
 
     lua_settop(L, 0);
@@ -384,14 +367,14 @@ int unzipFile(lua_State* L) {
  */
 int saveLastChangeToProfile(lua_State* L) {
     std::string asset = global::configuration->asset;
-    std::string logFilePath = absPath(global::configuration->scriptLog);
+    std::filesystem::path logFilePath = absPath(global::configuration->scriptLog);
     std::ifstream logfile(logFilePath);
     std::string actualLastLine;
     std::string lastLine;
     std::string line;
     //add check for log file
     if (!logfile.good()) {
-        ghoul::lua::push(L, fmt::format("Could not open scriptlog '{}'", logFilePath));
+        ghoul::lua::push(L, fmt::format("Could not open scriptlog {}", logFilePath));
         printInternal(ghoul::logging::LogLevel::Error, L);
     }
     while (std::getline (logfile,line)) {
@@ -406,21 +389,22 @@ int saveLastChangeToProfile(lua_State* L) {
     }
 
     std::string dataString = "${ASSETS}/";
-    std::string assetPath = absPath(fmt::format("{}{}.scene", dataString, asset));
-    std::string tempAssetPath = absPath(fmt::format("{}{}.scene.tmp", dataString, asset));
+    std::filesystem::path assetPath = absPath(fmt::format(
+        "{}{}.scene", dataString, asset
+    ));
+    std::filesystem::path tempAssetPath = absPath(fmt::format(
+        "{}{}.scene.tmp", dataString, asset
+    ));
     std::string strReplace = "--customizationsend";
     std::string strNew = fmt::format("{}\n{}",actualLastLine, strReplace);
     std::ifstream filein(assetPath);
     std::ofstream fileout(tempAssetPath);
     if (!filein) {
-        ghoul::lua::push(L, fmt::format("Could not open profile '{}'", assetPath));
+        ghoul::lua::push(L, fmt::format("Could not open profile {}", assetPath));
         printInternal(ghoul::logging::LogLevel::Error, L);
     }
     if (!fileout) {
-        ghoul::lua::push(
-            L,
-            fmt::format("Could not open tmp profile '{}'", tempAssetPath)
-        );
+        ghoul::lua::push(L, fmt::format("Could not open tmp profile {}", tempAssetPath));
         printInternal(ghoul::logging::LogLevel::Error, L);
     }
 
@@ -436,16 +420,21 @@ int saveLastChangeToProfile(lua_State* L) {
     filein.close();
     fileout.close();
     if (found) {
-        FileSys.deleteFile(assetPath);
-        int success = rename(tempAssetPath.c_str(), assetPath.c_str());
+        if (std::filesystem::is_regular_file(assetPath)) {
+            std::filesystem::remove(assetPath);
+        }
+        int success = rename(tempAssetPath.string().c_str(), assetPath.string().c_str());
         if (success != 0) {
-            std::string error = fmt::format("Error renaming file {} to {}",
-            tempAssetPath, assetPath);
+            std::string error = fmt::format(
+                "Error renaming file {} to {}", tempAssetPath, assetPath
+            );
             ghoul::lua::push(L, error);
             printInternal(ghoul::logging::LogLevel::Error, L);
             return -1;
         }
-        FileSys.deleteFile(tempAssetPath);
+        if (std::filesystem::is_regular_file(tempAssetPath)) {
+            std::filesystem::remove(tempAssetPath);
+        }
         return 0;
     }
     else {
diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index 7898b27c49..c80e1487fb 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -62,13 +62,9 @@ documentation::Documentation ScriptScheduler::Documentation() {
     // @TODO (abock, 2021-03-25)  This is not really correct. This function currently
     // returns the documentation for the ScheduledScript, not for the ScriptScheduler
     // itself. This should be cleaned up a bit
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "core_scheduledscript";
-    return doc;
+    return codegen::doc<Parameters>("core_scheduledscript");
 }
 
-using namespace openspace::interaction;
-
 ScriptScheduler::ScheduledScript::ScheduledScript(const ghoul::Dictionary& dict) {
     const Parameters p = codegen::bake<Parameters>(dict);
 
@@ -186,7 +182,7 @@ ScriptScheduler::progressTo(double newTime)
     }
 }
 
-void ScriptScheduler::setTimeReferenceMode(KeyframeTimeRef refType) {
+void ScriptScheduler::setTimeReferenceMode(interaction::KeyframeTimeRef refType) {
     _timeframeMode = refType;
 }
 
@@ -216,15 +212,15 @@ std::vector<ScriptScheduler::ScheduledScript> ScriptScheduler::allScripts() cons
 }
 
 void ScriptScheduler::setModeApplicationTime() {
-    _timeframeMode = KeyframeTimeRef::Relative_applicationStart;
+    _timeframeMode = interaction::KeyframeTimeRef::Relative_applicationStart;
 }
 
 void ScriptScheduler::setModeRecordedTime() {
-    _timeframeMode = KeyframeTimeRef::Relative_recordedStart;
+    _timeframeMode = interaction::KeyframeTimeRef::Relative_recordedStart;
 }
 
 void ScriptScheduler::setModeSimulationTime() {
-    _timeframeMode = KeyframeTimeRef::Absolute_simTimeJ2000;
+    _timeframeMode = interaction::KeyframeTimeRef::Absolute_simTimeJ2000;
 }
 
 LuaLibrary ScriptScheduler::luaLibrary() {
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index 4692e19525..2250aa80f9 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -25,10 +25,10 @@
 #include <openspace/util/httprequest.h>
 
 #include <ghoul/fmt.h>
-#include <ghoul/filesystem/directory.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
+#include <filesystem>
 
 #ifdef OPENSPACE_CURL_ENABLED
 #ifdef WIN32
@@ -254,7 +254,7 @@ void AsyncHttpDownload::start(HttpRequest::RequestOptions opt) {
         try {
             download(opt);
         }
-        catch (const ghoul::filesystem::FileSystem::FileSystemException& e) {
+        catch (const ghoul::RuntimeError& e) {
             LERRORC(e.component, e.message);
         }
     });
@@ -349,18 +349,17 @@ HttpFileDownload::HttpFileDownload(std::string destination,
 {}
 
 bool HttpFileDownload::initDownload() {
-    if (!_overwrite && FileSys.fileExists(_destination)) {
+    if (!_overwrite && std::filesystem::is_regular_file(_destination)) {
         LWARNING(fmt::format("File {} already exists", _destination));
         return false;
     }
 
-    ghoul::filesystem::File destinationFile = _destination;
-    ghoul::filesystem::Directory d = destinationFile.directoryName();
+    std::filesystem::path d = std::filesystem::path(_destination).parent_path();
 
     {
-        std::lock_guard<std::mutex> g(_directoryCreationMutex);
-        if (!FileSys.directoryExists(d)) {
-            FileSys.createDirectory(d, ghoul::filesystem::FileSystem::Recursive::Yes);
+        std::lock_guard g(_directoryCreationMutex);
+        if (!std::filesystem::is_directory(d)) {
+            std::filesystem::create_directories(d);
         }
     }
 
@@ -392,13 +391,13 @@ bool HttpFileDownload::initDownload() {
             std::string message(Buffer, size);
 
             LERROR(fmt::format(
-                "Cannot open file {}: {}", std::string(destinationFile), message)
+                "Cannot open file {}: {}", _destination, message)
             );
 
             return false;
         }
         else {
-            LERROR(fmt::format("Cannot open file {}", std::string(destinationFile)));
+            LERROR(fmt::format("Cannot open file {}", _destination));
             return false;
         }
 #else
@@ -407,21 +406,21 @@ bool HttpFileDownload::initDownload() {
             char buffer[255];
             LERROR(fmt::format(
                 "Cannot open file '{}': {}",
-                std::string(destinationFile),
+                std::string(_destination),
                 std::string(strerror_r(errno, buffer, sizeof(buffer)))
             ));
             return false;
 #else
             LERROR(fmt::format(
                 "Cannot open file '{}': {}",
-                std::string(destinationFile),
+                std::string(_destination),
                 std::string(strerror(errno))
             ));
             return false;
 #endif
         }
 
-        LERROR(fmt::format("Cannot open file {}", std::string(destinationFile)));
+        LERROR(fmt::format("Cannot open file {}", std::string(_destination)));
         return false;
 #endif
     }
diff --git a/modules/digitaluniverse/shaders/points_fs.glsl b/src/util/json_helper.cpp
similarity index 58%
rename from modules/digitaluniverse/shaders/points_fs.glsl
rename to src/util/json_helper.cpp
index a38eb2d5fb..6466c7a525 100644
--- a/modules/digitaluniverse/shaders/points_fs.glsl
+++ b/src/util/json_helper.cpp
@@ -22,34 +22,58 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include "fragment.glsl"
+namespace openspace {
 
-//in float gs_screenSpaceDepth;
-in float vs_screenSpaceDepth;
-in vec4 colorMap;
-
-uniform vec3 color;
-uniform float alphaValue;
-uniform bool hasColorMap;
-
-Fragment getFragment() {
-    Fragment frag;
-
-    if (alphaValue == 0.0) {
-        discard;
+std::string escapedJson(const std::string& text) {
+    std::string jsonString;
+    jsonString.reserve(text.size());
+    for (const char& c : text) {
+        switch (c) {
+            case '\t':
+                jsonString += "\\t"; // Replace tab with \t.
+                break;
+            case '"':
+                jsonString += "\\\""; // Replace " with \".
+                break;
+            case '\\':
+                jsonString += "\\\\"; // Replace \ with \\.
+                break;
+            case '\n':
+                jsonString += "\\\\n"; // Replace newline with \n.
+                break;
+            case '\r':
+                jsonString += "\\r"; // Replace carriage return with \r.
+                break;
+            default:
+                jsonString += c;
+        }
     }
-
-    if (hasColorMap) {
-        frag.color = vec4(colorMap.xyz, alphaValue);        
-    }
-    else {
-        frag.color = vec4(color, alphaValue);
-    }
-    
-    //frag.depth = gs_screenSpaceDepth;
-    frag.depth = vs_screenSpaceDepth;
-    frag.gPosition  = vec4(1e27, 1e27, 1e27, 1.0);
-    frag.gNormal    = vec4(0.0, 0.0, 0.0, 1.0);
-
-    return frag;
+    return jsonString;
 }
+
+std::string escapedJson(const std::vector<std::string>& list) {
+    std::string jsonString;
+    jsonString += "[";
+    for (const std::string& text : list) {
+        jsonString += "\\\"";
+        jsonString += escapedJson(text);
+        jsonString += "\\\",";
+    }
+    if (jsonString.length() > 1) {
+        jsonString.pop_back();
+    }
+    jsonString += "]";
+
+    return jsonString;
+}
+
+std::string formatJsonNumber(double d) {
+    // to_string will represent infinite values with 'inf' and NaNs with 'nan'.
+    // These are not valid in JSON, so use 'null' instead
+    if (!std::isfinite(d)) {
+        return "null";
+    }
+    return std::to_string(d);
+}
+
+}  // namespace openspace
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index 0bc39e71cd..7c3d6dc83d 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -32,6 +32,7 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
+#include <filesystem>
 
 #include <openspace/modulepath.h>
 
@@ -59,13 +60,9 @@ void OpenSpaceModule::initialize(const ghoul::Dictionary& configuration) {
         [](char v) { return static_cast<char>(toupper(v)); }
     );
 
-    std::string moduleToken =
-        ghoul::filesystem::FileSystem::TokenOpeningBraces +
-        std::string(ModuleBaseToken) +
-        upperIdentifier +
-        ghoul::filesystem::FileSystem::TokenClosingBraces;
+    std::string moduleToken = "${" + std::string(ModuleBaseToken) + upperIdentifier + "}";
 
-    std::string path = modulePath();
+    std::filesystem::path path = modulePath();
     LDEBUG(fmt::format("Registering module path {}: {}", moduleToken, path));
     FileSys.registerPathToken(moduleToken, std::move(path));
 
@@ -123,21 +120,22 @@ std::string OpenSpaceModule::modulePath() const {
     );
 
     // First try the internal module directory
-    if (FileSys.directoryExists(absPath("${MODULES}/" + moduleIdentifier))) {
-        return absPath("${MODULES}/" + moduleIdentifier);
+    std::filesystem::path path = absPath("${MODULES}/" + moduleIdentifier);
+    if (std::filesystem::is_directory(path)) {
+        return path.string();
     }
     else { // Otherwise, it might be one of the external directories
         for (const char* dir : ModulePaths) {
-            const std::string& path = std::string(dir) + '/' + moduleIdentifier;
-            if (FileSys.directoryExists(absPath(path))) {
-                return absPath(path);
+            const std::string& p = std::string(dir) + '/' + moduleIdentifier;
+            if (std::filesystem::is_directory(absPath(p))) {
+                return absPath(p).string();
             }
         }
     }
 
     // If we got this far, neither the internal module nor any of the external modules fit
     throw ghoul::RuntimeError(
-        "Could not resolve path for module '" + identifier() + "'",
+        fmt::format("Could not resolve path for module {}", identifier()),
         "OpenSpaceModule"
     );
 }
diff --git a/src/util/resourcesynchronization.cpp b/src/util/resourcesynchronization.cpp
index 6d391f3701..45b655ea30 100644
--- a/src/util/resourcesynchronization.cpp
+++ b/src/util/resourcesynchronization.cpp
@@ -47,9 +47,7 @@ namespace {
 namespace openspace {
 
 documentation::Documentation ResourceSynchronization::Documentation() {
-    documentation::Documentation doc = codegen::doc<Parameters>();
-    doc.id = "resourceSynchronization";
-    return doc;
+    return codegen::doc<Parameters>("resourceSynchronization");
 }
 
 std::unique_ptr<ResourceSynchronization> ResourceSynchronization::createFromDictionary(
diff --git a/src/util/screenlog.cpp b/src/util/screenlog.cpp
index 40e42f679e..95e9d099f5 100644
--- a/src/util/screenlog.cpp
+++ b/src/util/screenlog.cpp
@@ -36,7 +36,7 @@ ScreenLog::ScreenLog(std::chrono::seconds timeToLive, LogLevel logLevel)
 }
 
 void ScreenLog::removeExpiredEntries() {
-    std::lock_guard<std::mutex> guard(_mutex);
+    std::lock_guard guard(_mutex);
     const auto t = std::chrono::steady_clock::now();
 
     const auto rit = std::remove_if(
@@ -49,7 +49,7 @@ void ScreenLog::removeExpiredEntries() {
 }
 
 void ScreenLog::log(LogLevel level, std::string_view category, std::string_view message) {
-    std::lock_guard<std::mutex> guard(_mutex);
+    std::lock_guard guard(_mutex);
     if (level >= _logLevel) {
         _entries.push_back({
             level,
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 1b22158f2c..fa862a73df 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -32,6 +32,7 @@
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/profiling.h>
 #include <algorithm>
+#include <filesystem>
 #include "SpiceUsr.h"
 #include "SpiceZpr.h"
 
@@ -202,18 +203,18 @@ void throwSpiceError(const std::string& errorMessage) {
 SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
     ghoul_assert(!filePath.empty(), "Empty file path");
     ghoul_assert(
-        FileSys.fileExists(filePath),
+        std::filesystem::is_regular_file(filePath),
         fmt::format("File '{}' ('{}') does not exist", filePath, absPath(filePath))
     );
     ghoul_assert(
-        FileSys.directoryExists(ghoul::filesystem::File(filePath).directoryName()),
+        std::filesystem::is_directory(std::filesystem::path(filePath).parent_path()),
         fmt::format(
             "File '{}' exists, but directory '{}' doesn't",
-            absPath(filePath), ghoul::filesystem::File(filePath).directoryName()
+            absPath(filePath), std::filesystem::path(filePath).parent_path().string()
         )
     );
 
-    std::string path = absPath(std::move(filePath));
+    std::filesystem::path path = absPath(std::move(filePath));
     const auto it = std::find_if(
         _loadedKernels.begin(),
         _loadedKernels.end(),
@@ -228,39 +229,33 @@ SpiceManager::KernelHandle SpiceManager::loadKernel(std::string filePath) {
     // We need to set the current directory as meta-kernels are usually defined relative
     // to the directory they reside in. The directory change is not necessary for regular
     // kernels
-    ghoul::filesystem::Directory currentDirectory = FileSys.currentDirectory();
-    using RawPath = ghoul::filesystem::File::RawPath;
-    std::string fileDirectory = ghoul::filesystem::File(
-        path,
-        RawPath::Yes
-    ).directoryName();
-    FileSys.setCurrentDirectory(fileDirectory);
+    std::filesystem::path currentDirectory = std::filesystem::current_path();
+
+    std::filesystem::path p = std::filesystem::path(path).parent_path();
+    std::filesystem::current_path(p);
 
     LINFO(fmt::format("Loading SPICE kernel '{}'", path));
     // Load the kernel
-    furnsh_c(path.c_str());
+    furnsh_c(path.string().c_str());
 
     // Reset the current directory to the previous one
-    FileSys.setCurrentDirectory(currentDirectory);
+    std::filesystem::current_path(currentDirectory);
 
     if (failed_c()) {
         throwSpiceError("Kernel loading");
     }
 
-    std::string fileExtension = ghoul::filesystem::File(
-        path,
-        RawPath::Yes
-    ).fileExtension();
-    if (fileExtension == "bc" || fileExtension == "BC") {
-        findCkCoverage(path); // binary ck kernel
+    std::filesystem::path fileExtension = std::filesystem::path(path).extension();
+    if (fileExtension == ".bc" || fileExtension == ".BC") {
+        findCkCoverage(path.string()); // binary ck kernel
     }
-    else if (fileExtension == "bsp" || fileExtension == "BSP") {
-        findSpkCoverage(path); // binary spk kernel
+    else if (fileExtension == ".bsp" || fileExtension == ".BSP") {
+        findSpkCoverage(path.string()); // binary spk kernel
     }
 
     KernelHandle kernelId = ++_lastAssignedKernel;
     ghoul_assert(kernelId != 0, fmt::format("Kernel Handle wrapped around to 0"));
-    _loadedKernels.push_back({std::move(path), kernelId, 1});
+    _loadedKernels.push_back({ path.string(), kernelId, 1 });
     return kernelId;
 }
 
@@ -293,7 +288,7 @@ void SpiceManager::unloadKernel(KernelHandle kernelId) {
 void SpiceManager::unloadKernel(std::string filePath) {
     ghoul_assert(!filePath.empty(), "Empty filename");
 
-    std::string path = absPath(std::move(filePath));
+    std::filesystem::path path = absPath(std::move(filePath));
 
     const auto it = std::find_if(
         _loadedKernels.begin(),
@@ -315,7 +310,7 @@ void SpiceManager::unloadKernel(std::string filePath) {
         // If there was only one part interested in the kernel, we can unload it
         if (it->refCount == 1) {
             LINFO(fmt::format("Unloading SPICE kernel '{}'", path));
-            unload_c(path.c_str());
+            unload_c(path.string().c_str());
             _loadedKernels.erase(it);
         }
         else {
@@ -1006,7 +1001,10 @@ SpiceManager::TerminatorEllipseResult SpiceManager::terminatorEllipse(
 
 void SpiceManager::findCkCoverage(const std::string& path) {
     ghoul_assert(!path.empty(), "Empty file path");
-    ghoul_assert(FileSys.fileExists(path), fmt::format("File '{}' does not exist", path));
+    ghoul_assert(
+        std::filesystem::is_regular_file(path),
+        fmt::format("File '{}' does not exist", path)
+    );
 
     constexpr unsigned int MaxObj = 256;
     constexpr unsigned int WinSiz = 10000;
@@ -1062,7 +1060,10 @@ void SpiceManager::findCkCoverage(const std::string& path) {
 
 void SpiceManager::findSpkCoverage(const std::string& path) {
     ghoul_assert(!path.empty(), "Empty file path");
-    ghoul_assert(FileSys.fileExists(path), fmt::format("File '{}' does not exist", path));
+    ghoul_assert(
+        std::filesystem::is_regular_file(path),
+        fmt::format("File '{}' does not exist", path)
+    );
 
     constexpr unsigned int MaxObj = 256;
     constexpr unsigned int WinSiz = 10000;
@@ -1361,11 +1362,31 @@ scripting::LuaLibrary SpiceManager::luaLibrary() {
             },
             {
                 "getCkCoverage",
-                & luascriptfunctions::ckCoverage,
+                &luascriptfunctions::ckCoverage,
                 {},
                 "{string [, printValues]}",
                 "Returns a list of CK coverage intervals for the target."
             },
+            {
+                "rotationMatrix",
+                &luascriptfunctions::rotationMatrix,
+                {},
+                "{string, string, string}",
+                "Returns the rotationMatrix for a given body in a frame of reference at a specific"
+                "time. The first agument is the target body, the second is the frame of reference,"
+                " the third is the time. Example: openspace.spice.rotationMatrix('"
+                "INSIGHT_LANDER_CRUISE','MARS', '2018 NOV 26 19:45:34')."
+            },
+            {
+                "position",
+                &luascriptfunctions::position,
+                {},
+                "{string, string, string, string}",
+                "Returns the position for a target by an observer in a frame of reference at a specific"
+                "time. The first agument is the target body, the second is the observer body, the third"
+                "is the frame of reference, and the fourth is the time. Example: openspace.spice."
+                "position('INSIGHT','MARS','GALACTIC', '2018 NOV 26 19:45:34')."
+            },
             {
                 "getSpiceBodies",
                 &luascriptfunctions::spiceBodies,
diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl
index 0633be6b09..b0c2df9b63 100644
--- a/src/util/spicemanager_lua.inl
+++ b/src/util/spicemanager_lua.inl
@@ -25,6 +25,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <openspace/engine/globals.h>
 #include <ghoul/logging/logmanager.h>
+#include <filesystem>
 
 namespace openspace::luascriptfunctions {
 
@@ -51,7 +52,7 @@ int loadKernel(lua_State* L) {
         1,
         ghoul::lua::PopValue::Yes
     );
-    if (!FileSys.fileExists(argument)) {
+    if (!std::filesystem::is_regular_file(argument)) {
         return ghoul::lua::luaError(
             L,
             fmt::format("Kernel file '{}' did not exist", argument)
@@ -230,4 +231,76 @@ int ckCoverage(lua_State* L) {
     return 1;
 }
 
+/**
+ * rotationMatrix({string, string, string}):
+ * Returns the rotationMatrix for a given body in a frame of reference
+ * at a specific time.
+ */
+int rotationMatrix(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 3, "lua::rotationMatrix");
+
+    const bool isString = (lua_isstring(L, 1) == 1) &&
+        (lua_isstring(L, 2) == 1) && (lua_isstring(L, 3) == 1);
+
+    if (!isString) {
+        LERRORC(
+            "rotationMatrix",
+            fmt::format(
+                "{}: Expected argument of type 'string' for all three agruments",
+                ghoul::lua::errorLocation(L)
+            )
+        );
+        lua_settop(L, 0);
+        ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
+        return 0;
+    }
+
+    std::string body = ghoul::lua::value<std::string>(L, 1);
+    std::string frame = ghoul::lua::value<std::string>(L, 2);
+    std::string date = ghoul::lua::value<std::string>(L, 3);
+    const double ephemerisTime = SpiceManager::ref().ephemerisTimeFromDate(date);
+    glm::dmat3 rotationMatrix = SpiceManager::ref().frameTransformationMatrix
+    (body, frame, ephemerisTime);
+    ghoul::lua::push(L, 1, rotationMatrix);
+
+    return 1;
+}
+
+/**
+ * position({string, string, string, string}):
+ * Returns the position for a given body relative to another body, 
+ * in a given frame of reference, at a specific time.
+ */
+int position(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 4, "lua::position");
+
+    const bool isString = (lua_isstring(L, 1) == 1) &&
+        (lua_isstring(L, 2) == 1) &&
+        (lua_isstring(L, 3) == 1) &&
+        (lua_isstring(L, 4) == 1);
+
+    if (!isString) {
+        LERRORC(
+            "position",
+            fmt::format(
+                "{}: Expected argument of type 'string' for all four agruments",
+                ghoul::lua::errorLocation(L)
+            )
+        );
+        lua_settop(L, 0);
+        ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
+        return 0;
+    }
+
+    std::string target = ghoul::lua::value<std::string>(L, 1);
+    std::string observer = ghoul::lua::value<std::string>(L, 2);
+    std::string frame = ghoul::lua::value<std::string>(L, 3);
+    std::string date = ghoul::lua::value<std::string>(L, 4);
+    const double ephemerisTime = SpiceManager::ref().ephemerisTimeFromDate(date);
+    glm::dvec3 postion = SpiceManager::ref().targetPosition(target, observer, frame, {}, ephemerisTime);
+    ghoul::lua::push(L, 1, postion);
+
+    return 1;
+}
+
 } // namespace openspace::luascriptfunctions
diff --git a/src/util/task.cpp b/src/util/task.cpp
index 23dac7fc42..00572e7800 100644
--- a/src/util/task.cpp
+++ b/src/util/task.cpp
@@ -30,38 +30,27 @@
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/templatefactory.h>
 
+namespace {
+    struct [[codegen::Dictionary(Task)]] Parameters {
+        // This key specifies the type of Task that gets created. It has to be one of the
+        // valid Tasks that are available for creation (see the FactoryDocumentation for a
+        // list of possible Tasks), which depends on the configration of the application
+        std::string type [[codegen::annotation("A valid Task created by a factory")]];
+    };
+#include "task_codegen.cpp"
+} // namespace
+
 namespace openspace {
 
 documentation::Documentation Task::documentation() {
-    using namespace documentation;
-    return {
-        "Task",
-        "core_task",
-        {
-            {
-                "Type",
-                new StringAnnotationVerifier("A valid Task created by a factory"),
-                Optional::No,
-                "This key specifies the type of Task that gets created. It has to be one"
-                "of the valid Tasks that are available for creation (see the "
-                "FactoryDocumentation for a list of possible Tasks), which depends on "
-                "the configration of the application"
-            }
-        }
-    };
+    return codegen::doc<Parameters>("core_task");
 }
 
 std::unique_ptr<Task> Task::createFromDictionary(const ghoul::Dictionary& dictionary) {
-    openspace::documentation::testSpecificationAndThrow(
-        documentation::Documentation(),
-        dictionary,
-        "Task"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    std::string taskType = dictionary.value<std::string>("Type");
     auto factory = FactoryManager::ref().factory<Task>();
-
-    Task* task = factory->create(taskType, dictionary);
+    Task* task = factory->create(p.type, dictionary);
     return std::unique_ptr<Task>(task);
 }
 
diff --git a/src/util/taskloader.cpp b/src/util/taskloader.cpp
index 821dc8d108..bc48d26799 100644
--- a/src/util/taskloader.cpp
+++ b/src/util/taskloader.cpp
@@ -33,6 +33,7 @@
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/misc/dictionary.h>
 #include <algorithm>
+#include <filesystem>
 
 namespace {
     constexpr const char* _loggerCat = "TaskRunner";
@@ -68,21 +69,19 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromDictionary(
 }
 
 std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromFile(const std::string& path) {
-    std::string absTasksFile = absPath(path);
-    if (!FileSys.fileExists(ghoul::filesystem::File(absTasksFile))) {
-        LERROR(fmt::format(
-            "Could not load tasks file '{}'. File not found", absTasksFile
-        ));
+    std::filesystem::path absTasksFile = absPath(path);
+    if (!std::filesystem::is_regular_file(absTasksFile)) {
+        LERROR(fmt::format("Could not load tasks file {}. File not found", absTasksFile));
         return std::vector<std::unique_ptr<Task>>();
     }
 
     ghoul::Dictionary tasksDictionary;
     try {
-        ghoul::lua::loadDictionaryFromFile(absTasksFile, tasksDictionary);
+        ghoul::lua::loadDictionaryFromFile(absTasksFile.string(), tasksDictionary);
     }
     catch (const ghoul::RuntimeError& e) {
         LERROR(fmt::format(
-            "Could not load tasks file '{}'. Lua error: {}: {}",
+            "Could not load tasks file {}. Lua error: {}: {}",
             absTasksFile, e.message, e.component
         ));
         return std::vector<std::unique_ptr<Task>>();
@@ -92,10 +91,7 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromFile(const std::string&
         return tasksFromDictionary(tasksDictionary);
     }
     catch (const documentation::SpecificationError& e) {
-        LERROR(
-            fmt::format("Could not load tasks file '{}'. {}",
-            absTasksFile, e.what())
-        );
+        LERROR(fmt::format("Could not load tasks file {}. {}", absTasksFile, e.what()));
         for (const documentation::TestResult::Offense& o : e.result.offenses) {
             LERROR(ghoul::to_string(o));
         }
diff --git a/src/util/time.cpp b/src/util/time.cpp
index bd886aa9aa..84bbe09594 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -175,20 +175,21 @@ scripting::LuaLibrary Time::luaLibrary() {
                 &luascriptfunctions::time_togglePause,
                 {},
                 "",
-                "Toggles the pause function, i.e. temporarily setting the delta time to 0"
-                " and restoring it afterwards"
+                "Toggles the pause function, i.e. temporarily setting the delta time to "
+                "0 and restoring it afterwards"
             },
             {
                 "interpolateTime",
                 &luascriptfunctions::time_interpolateTime,
                 {},
                 "{number, string} [, number]",
-                "Sets the current simulation time to the "
-                "specified value. If the parameter is a number, the value is the number "
+                "Sets the current simulation time to the specified value. "
+                "If the first parameter is a number, the target is the number "
                 "of seconds past the J2000 epoch. If it is a string, it has to be a "
-                "valid ISO 8601-like date string of the format YYYY-MM-DDTHH:MN:SS. "
-                "Note: providing time zone using the Z format is not supported. UTC is "
-                "assumed."
+                "valid ISO 8601-like date string of the format YYYY-MM-DDTHH:MN:SS "
+                "(Note: providing time zone using the Z format is not supported. UTC is "
+                "assumed). If a second input value is given, the interpolation is done "
+                "over the specified number of seconds."
             },
             {
                 "interpolateTimeRelative",
@@ -264,6 +265,15 @@ scripting::LuaLibrary Time::luaLibrary() {
                 " and restoring it afterwards. If an input value is given, the "
                 "interpolation is done over the specified number of seconds."
             },
+            {
+                "pauseToggleViaKeyboard",
+                &luascriptfunctions::time_pauseToggleViaKeyboard,
+                {},
+                "",
+                "Toggles the pause function from a keypress. This function behaves like"
+                " interpolateTogglePause during normal mode, and behaves like"
+                " sessionRecording.pausePlayback when playing-back a recording."
+            },
             {
                 "currentTime",
                 &luascriptfunctions::time_currentTime,
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index 95ebcd4d11..185567f97b 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -24,6 +24,7 @@
 
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
+#include <openspace/interaction/sessionrecording.h>
 #include <openspace/scene/scene.h>
 #include <openspace/util/timeconversion.h>
 
@@ -379,6 +380,44 @@ int time_interpolateTogglePause(lua_State* L) {
     return 0;
 }
 
+/**
+* \ingroup LuaScripts
+* time_pauseToggleViaKeyboard():
+* This allows for a keypress (via keybinding) to have dual functionality. In normal
+* operational mode it will behave just like time_interpolateTogglePause, but
+* during playback of a session recording it will pause the playback without manipulating
+* the delta time.
+*/
+int time_pauseToggleViaKeyboard(lua_State* L) {
+    const int nArguments = lua_gettop(L);
+
+    if (nArguments == 0) {
+        if (global::sessionRecording->isPlayingBack()) {
+            bool isPlaybackPaused = global::sessionRecording->isPlaybackPaused();
+            global::sessionRecording->setPlaybackPause(!isPlaybackPaused);
+        }
+        else {
+            const bool pause = !global::timeManager->isPaused();
+            global::timeManager->interpolatePause(pause,
+                pause ?
+                global::timeManager->defaultPauseInterpolationDuration() :
+                global::timeManager->defaultUnpauseInterpolationDuration()
+            );
+        }
+    }
+    else {
+        lua_settop(L, 0);
+        return luaL_error(
+            L,
+            "bad number of arguments, expected 0 or 1, got %i",
+            nArguments
+        );
+    }
+
+    lua_settop(L, 0);
+    ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
+    return 0;
+}
 
 /**
  * \ingroup LuaScripts
diff --git a/src/util/timerange.cpp b/src/util/timerange.cpp
index 443cc2eca9..b2c36e467d 100644
--- a/src/util/timerange.cpp
+++ b/src/util/timerange.cpp
@@ -31,32 +31,20 @@
 #include <ghoul/misc/dictionary.h>
 
 namespace {
-    constexpr const char* KeyStart = "Start";
-    constexpr const char* KeyEnd = "End";
+    struct [[codegen::Dictionary(TimeRange)]] Parameters {
+        // The start date of the time range
+        std::string start [[codegen::annotation("A string representing a valid date")]];
+
+        // The end date of the time range
+        std::string end [[codegen::annotation("A string representing a valid date")]];
+    };
+#include "timerange_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation TimeRange::Documentation() {
-    using namespace documentation;
-    return {
-        "Time Range",
-        "core_util_timerange",
-        {
-            {
-                KeyStart,
-                new StringAnnotationVerifier("A string representing a valid date"),
-                Optional::No,
-                "The start date of the time range"
-            },
-            {
-                KeyEnd,
-                new StringAnnotationVerifier("A string representing a valid date"),
-                Optional::No,
-                "The end date of the time range"
-            }
-        }
-    };
+    return codegen::doc<Parameters>("core_util_timerange");
 }
 
 TimeRange::TimeRange(double startTime, double endTime)
@@ -73,19 +61,10 @@ TimeRange::TimeRange(const ghoul::Dictionary& dict) {
 bool TimeRange::initializeFromDictionary(const ghoul::Dictionary& dict,
                                          TimeRange& timeRange)
 {
-    if (dict.hasValue<std::string>(KeyStart) && dict.hasValue<std::string>(KeyEnd)) {
-        std::string startTimeStr = dict.value<std::string>(KeyStart);
-        std::string endTimeStr = dict.value<std::string>(KeyEnd);
-        // Parse to date.
-        // @TODO converting string to time stamp should not rely on Spice
-        timeRange.start = SpiceManager::ref().ephemerisTimeFromDate(startTimeStr);
-        timeRange.end = SpiceManager::ref().ephemerisTimeFromDate(endTimeStr);
-        return true;
-    }
-    else {
-        // Could not read TimeRange from Dict
-        return false;
-    }
+    const Parameters p = codegen::bake<Parameters>(dict);
+    timeRange.start = SpiceManager::ref().ephemerisTimeFromDate(p.start);
+    timeRange.end = SpiceManager::ref().ephemerisTimeFromDate(p.end);
+    return true;
 }
 
 void TimeRange::include(double val) {
diff --git a/src/util/versionchecker.cpp b/src/util/versionchecker.cpp
index 6eddfd9644..6ee129c32e 100644
--- a/src/util/versionchecker.cpp
+++ b/src/util/versionchecker.cpp
@@ -43,9 +43,10 @@ void VersionChecker::requestLatestVersion(const std::string& url) {
     HttpRequest::RequestOptions opt;
     opt.requestTimeoutSeconds = 0;
 
-    const std::string fullUrl = url +
-        "?client_version=" + OPENSPACE_VERSION_NUMBER +
-        "&commit_hash=" + OPENSPACE_GIT_COMMIT;
+    std::string fullUrl = fmt::format(
+        "{}?client_version={}&commit_hash={}",
+        url, OPENSPACE_VERSION_NUMBER, OPENSPACE_GIT_COMMIT
+    );
 
     if (_request) {
         _request->cancel();
diff --git a/support/cmake/set_openspace_compile_settings.cmake b/support/cmake/set_openspace_compile_settings.cmake
index a0c96ab0a9..2dc978d17f 100644
--- a/support/cmake/set_openspace_compile_settings.cmake
+++ b/support/cmake/set_openspace_compile_settings.cmake
@@ -55,12 +55,10 @@ function (set_openspace_compile_settings target)
     # This is disabled until GLM is updated to version 0.9.9 that removes occurrance of this warning
     # "/w44574"   # 'identifier' is defined to be '0': did you mean to use '#if identifier'?
     "/w44608"   # 'symbol1' has already been initialized by another union member in the initializer list, 'symbol2'
-    "/w44619"   # #pragma warning: there is no warning number 'number'
     "/w44628"   # digraphs not supported with -Ze. Character sequence 'digraph' not interpreted as alternate token for 'char'
     "/w44640"   # 'instance': construction of local static object is not thread-safe
     "/w44905"   # wide string literal cast to 'LPSTR'
     "/w44906"   # string literal cast to 'LPWSTR'
-    "/w44946"   # reinterpret_cast used between related classes: 'class1' and 'class2'
     "/w44986"   # 'symbol': exception specification does not match previous declaration
     "/w44988"   # 'symbol': variable declared outside class/function scope
     "/std:c++latest"
diff --git a/support/coding/codegen b/support/coding/codegen
index 4b06f1ad45..af8906ff56 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 4b06f1ad4586289f0f1523915e11b1c81fe21202
+Subproject commit af8906ff56c4b02d2f4a30c02d56477225dd10ce
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c68874247c..cae023372f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -32,9 +32,9 @@ add_executable(
   test_configuration.cpp
   test_documentation.cpp
   test_iswamanager.cpp
+  test_jsonformatting.cpp
   test_latlonpatch.cpp
   test_lrucache.cpp
-  test_luaconversions.cpp
   test_lua_createsinglecolorimage.cpp
   test_profile.cpp
   test_rawvolumeio.cpp
diff --git a/tests/main.cpp b/tests/main.cpp
index 578dc62cb1..05358752c3 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -38,6 +38,7 @@
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/ghoul.h>
+#include <filesystem>
 #include <iostream>
 
 int main(int argc, char** argv) {
@@ -54,17 +55,20 @@ int main(int argc, char** argv) {
     // to make it possible to find other files in the same directory.
     FileSys.registerPathToken(
         "${BIN}",
-        ghoul::filesystem::File(absPath(argv[0])).directoryName(),
+        std::filesystem::path(argv[0]).parent_path(),
         ghoul::filesystem::FileSystem::Override::Yes
     );
 
-    std::string configFile = configuration::findConfiguration();
+    std::filesystem::path configFile = configuration::findConfiguration();
     // Register the base path as the directory where 'filename' lives
-    std::string base = ghoul::filesystem::File(configFile).directoryName();
+    std::filesystem::path base = configFile.parent_path();
     constexpr const char* BasePathToken = "${BASE}";
     FileSys.registerPathToken(BasePathToken, base);
 
-    *global::configuration = configuration::loadConfigurationFromFile(configFile, "");
+    *global::configuration = configuration::loadConfigurationFromFile(
+        configFile.string(),
+        ""
+    );
     global::openSpaceEngine->registerPathTokens();
     global::openSpaceEngine->initialize();
 
diff --git a/tests/property/test_property_selectionproperty.cpp b/tests/property/test_property_selectionproperty.cpp
index 8b5225f837..5d903d91f2 100644
--- a/tests/property/test_property_selectionproperty.cpp
+++ b/tests/property/test_property_selectionproperty.cpp
@@ -119,7 +119,7 @@ TEST_CASE("SelectionProperty: Add Options", "[selectionproperty]") {
 
     const int nOptions = static_cast<int>(p.options().size());
     REQUIRE(nOptions == 2);
-    REQUIRE((p.hasOption("a") && p.hasOption("b")));
+    REQUIRE(p.options() == std::vector<std::string>{ "a", "b" });
 }
 
 TEST_CASE("SelectionProperty: Get String Value", "[selectionproperty]") {
@@ -168,7 +168,7 @@ TEST_CASE("SelectionProperty: Set Lua Value - Invalid Key", "[selectionproperty]
     p.setOptions({ "a", "b", "c" });
 
     ghoul::lua::LuaState L;
-    ghoul::lua::push(L, std::vector{ "a", "d" }); //
+    ghoul::lua::push(L, std::vector{ "a", "d" });
 
     p.setLuaValue(L);
 
@@ -218,8 +218,19 @@ TEST_CASE("SelectionProperty: Value From Copying Variable", "[selectionproperty]
     openspace::properties::SelectionProperty p({ "id", "gui", "desc" });
     p.setOptions({ "a", "b", "c" });
 
-    const std::set<std::string> list{ "a", "b" };
-    p = list;
+    p = { "a", "b" };
 
-    REQUIRE(p.value() == list);
+    REQUIRE(p.value() == std::set<std::string>{ "a", "b" });
+}
+
+TEST_CASE("SelectionProperty: Re-set Options After Selection", "[selectionproperty]") {
+    openspace::properties::SelectionProperty p({ "id", "gui", "desc" });
+    p.setOptions({ "a", "b", "c" });
+
+    p = { "a", "b" };
+
+    p.setOptions({ "a", "c", "d" }); // b no longer included
+                                     // => should be removed from selection
+
+    REQUIRE(p.value() == std::set<std::string>{ "a" });
 }
diff --git a/tests/test_assetloader.cpp b/tests/test_assetloader.cpp
index 084e52dd44..e5a63e8ead 100644
--- a/tests/test_assetloader.cpp
+++ b/tests/test_assetloader.cpp
@@ -57,7 +57,7 @@ TEST_CASE("AssetLoader: Assertion", "[assetloader]") {
     openspace::AssetLoader assetLoader(
         state,
         &syncWatcher,
-        FileSys.absolutePath("${TESTDIR}/AssetLoaderTest/")
+        absPath("${TESTDIR}/AssetLoaderTest/").string()
     );
 
     REQUIRE_NOTHROW(assetLoader.add("passassertion"));
@@ -71,7 +71,7 @@ TEST_CASE("AssetLoader: Basic Export Import", "[assetloader]") {
     openspace::AssetLoader assetLoader(
         state,
         &syncWatcher,
-        FileSys.absolutePath("${TESTDIR}/AssetLoaderTest/")
+        absPath("${TESTDIR}/AssetLoaderTest/").string()
     );
 
     REQUIRE_NOTHROW(assetLoader.add("require"));
@@ -84,7 +84,7 @@ TEST_CASE("AssetLoader: Asset Functions", "[assetloader]") {
     openspace::AssetLoader assetLoader(
         state,
         &syncWatcher,
-        FileSys.absolutePath("${TESTDIR}/AssetLoaderTest/")
+        absPath("${TESTDIR}/AssetLoaderTest/").string()
     );
 
     REQUIRE_NOTHROW(assetLoader.add("assetfunctionsexist"));
@@ -97,7 +97,7 @@ TEST_CASE("AssetLoader: Asset Initialization", "[assetloader]") {
     openspace::AssetLoader assetLoader(
         state,
         &syncWatcher,
-        FileSys.absolutePath("${TESTDIR}/AssetLoaderTest/")
+        absPath("${TESTDIR}/AssetLoaderTest/").string()
     );
 
     bool passed;
diff --git a/tests/test_configuration.cpp b/tests/test_configuration.cpp
index f7c031d251..25aa84be4f 100644
--- a/tests/test_configuration.cpp
+++ b/tests/test_configuration.cpp
@@ -300,10 +300,10 @@ TEST_CASE("Configuration: onScreenTextScaling", "[configuration]") {
     CHECK(c.onScreenTextScaling == "framebuffer");
 }
 
-TEST_CASE("Configuration: usePerSceneCache", "[configuration]") {
-    constexpr const char Extra[] = R"(PerSceneCache = true)";
-    const Configuration c = loadConfiguration("usePerSceneCache", Extra);
-    CHECK(c.usePerSceneCache == true);
+TEST_CASE("Configuration: usePerProfileCache", "[configuration]") {
+    constexpr const char Extra[] = R"(PerProfileCache = true)";
+    const Configuration c = loadConfiguration("usePerProfileCache", Extra);
+    CHECK(c.usePerProfileCache == true);
 }
 
 TEST_CASE("Configuration: isRenderingOnMasterDisabled", "[configuration]") {
diff --git a/src/properties/scalar/signedcharproperty.cpp b/tests/test_jsonformatting.cpp
similarity index 57%
rename from src/properties/scalar/signedcharproperty.cpp
rename to tests/test_jsonformatting.cpp
index a89fa006a3..59d791a81f 100644
--- a/src/properties/scalar/signedcharproperty.cpp
+++ b/tests/test_jsonformatting.cpp
@@ -22,51 +22,47 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <openspace/properties/scalar/signedcharproperty.h>
+#include "catch2/catch.hpp"
 
-#include <ghoul/lua/ghoul_lua.h>
+#include <openspace/json.h>
+#include <openspace/util/json_helper.h>
+#include <vector>
 
-#include <limits>
-#include <sstream>
+// Note: Dictionary formatting is tested in Ghoul
 
-namespace {
+TEMPLATE_TEST_CASE("FormatJson", "[formatjson]", glm::vec2, glm::vec3,
+    glm::vec4, glm::dvec2, glm::dvec3, glm::dvec4, glm::ivec2, glm::ivec3, glm::ivec4,
+    glm::uvec2, glm::uvec3, glm::uvec4, glm::mat2x2, glm::mat2x3, glm::mat2x4,
+    glm::mat3x2, glm::mat3x3, glm::mat3x4, glm::mat4x2, glm::mat4x3, glm::mat4x4,
+    glm::dmat2x2, glm::dmat2x3, glm::dmat2x4, glm::dmat3x2, glm::dmat3x3, glm::dmat3x4,
+    glm::dmat4x2, glm::dmat4x3, glm::dmat4x4)
+{
+    using T = TestType;
 
-signed char fromLuaConversion(lua_State* state, bool& success) {
-    success = (lua_isnumber(state, -1) == 1);
-    if (success) {
-        signed char val = static_cast<signed char>(lua_tonumber(state, -1));
-        return val;
-    }
-    else {
-        return 0;
-    }
+    const T val(1);
+
+    std::string json = openspace::formatJson(val);
+
+    // Compare with Ghoul's Lua conversions. Note that Lua uses '{' for arrays,
+    // while we here expect '[' for all glm types
+    std::string luaValue = ghoul::to_string(val);
+    luaValue.replace(0, 1, "[");
+    luaValue.replace(luaValue.size() - 1, 1, "]");
+
+    REQUIRE(json == luaValue);
 }
 
-bool toLuaConversion(lua_State* state, signed char value) {
-    lua_pushnumber(state, static_cast<lua_Number>(value));
-    return true;
+TEST_CASE("FormatJson - Bool", "[formatjson]") {
+    bool trueVal = true;
+    bool falseVal = false;
+
+    REQUIRE(openspace::formatJson(trueVal) == "true");
+    REQUIRE(openspace::formatJson(falseVal) == "false");
 }
 
-bool toStringConversion(std::string& outValue, signed char inValue) {
-    outValue = std::to_string(inValue);
-    return true;
+TEST_CASE("FormatJson - Infinity & Nan", "[formatjson]") {
+    REQUIRE(openspace::formatJson(std::numeric_limits<double>::infinity()) == "null");
+    REQUIRE(openspace::formatJson(std::numeric_limits<double>::quiet_NaN()) == "null");
 }
 
-} // namespace
-
-namespace openspace::properties {
-
-REGISTER_NUMERICALPROPERTY_SOURCE(
-    SignedCharProperty,
-    signed char,
-    0,
-    std::numeric_limits<signed char>::lowest(),
-    std::numeric_limits<signed char>::max(),
-    0,
-    fromLuaConversion,
-    toLuaConversion,
-    toStringConversion,
-    LUA_TNUMBER
-)
-
-} // namespace openspace::properties
+// @TODO(emmbr 2021-04-29) Add more tests at some point, if we find it necessary
diff --git a/tests/test_lua_createsinglecolorimage.cpp b/tests/test_lua_createsinglecolorimage.cpp
index 88b98d68ab..8c6f8120e6 100644
--- a/tests/test_lua_createsinglecolorimage.cpp
+++ b/tests/test_lua_createsinglecolorimage.cpp
@@ -30,6 +30,7 @@
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/luastate.h>
 #include <ghoul/lua/lua_helper.h>
+#include <filesystem>
 
 TEST_CASE("CreateSingleColorImage: Create image and check return value",
           "[createsinglecolorimage]")
@@ -126,7 +127,7 @@ TEST_CASE("CreateSingleColorImage: Check if file was created",
 
     CHECK(res == 1);
     std::string path = ghoul::lua::value<std::string>(L, 1);
-    CHECK(FileSys.fileExists(path));
+    CHECK(std::filesystem::is_regular_file(path));
 }
 
 TEST_CASE("CreateSingleColorImage: Load created image", "[createsinglecolorimage]") {
diff --git a/tests/test_luaconversions.cpp b/tests/test_luaconversions.cpp
deleted file mode 100644
index 958b73db65..0000000000
--- a/tests/test_luaconversions.cpp
+++ /dev/null
@@ -1,882 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2021                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include "catch2/catch.hpp"
-
-#include <openspace/properties/propertydelegate.h>
-#include <openspace/properties/scalar/boolproperty.h>
-#include <openspace/properties/scalar/charproperty.h>
-#include <openspace/properties/scalar/doubleproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-#include <openspace/properties/scalar/intproperty.h>
-#include <openspace/properties/scalar/longdoubleproperty.h>
-#include <openspace/properties/scalar/longlongproperty.h>
-#include <openspace/properties/scalar/longproperty.h>
-#include <openspace/properties/scalar/shortproperty.h>
-#include <openspace/properties/scalar/signedcharproperty.h>
-#include <openspace/properties/scalar/ucharproperty.h>
-#include <openspace/properties/scalar/uintproperty.h>
-#include <openspace/properties/scalar/ulonglongproperty.h>
-#include <openspace/properties/scalar/ulongproperty.h>
-#include <openspace/properties/scalar/ushortproperty.h>
-#include <openspace/properties/scalar/wcharproperty.h>
-#include <openspace/properties/vector/bvec2property.h>
-#include <openspace/properties/vector/bvec3property.h>
-#include <openspace/properties/vector/bvec4property.h>
-#include <openspace/properties/vector/dvec2property.h>
-#include <openspace/properties/vector/dvec3property.h>
-#include <openspace/properties/vector/dvec4property.h>
-#include <openspace/properties/vector/ivec2property.h>
-#include <openspace/properties/vector/ivec3property.h>
-#include <openspace/properties/vector/ivec4property.h>
-#include <openspace/properties/vector/uvec2property.h>
-#include <openspace/properties/vector/uvec3property.h>
-#include <openspace/properties/vector/uvec4property.h>
-#include <openspace/properties/vector/vec2property.h>
-#include <openspace/properties/vector/vec3property.h>
-#include <openspace/properties/vector/vec4property.h>
-#include <openspace/properties/matrix/mat2property.h>
-#include <openspace/properties/matrix/mat2x3property.h>
-#include <openspace/properties/matrix/mat2x4property.h>
-#include <openspace/properties/matrix/mat3x2property.h>
-#include <openspace/properties/matrix/mat3property.h>
-#include <openspace/properties/matrix/mat3x4property.h>
-#include <openspace/properties/matrix/mat4x2property.h>
-#include <openspace/properties/matrix/mat4x3property.h>
-#include <openspace/properties/matrix/mat4property.h>
-#include <openspace/properties/matrix/dmat2property.h>
-#include <openspace/properties/matrix/dmat2x3property.h>
-#include <openspace/properties/matrix/dmat2x4property.h>
-#include <openspace/properties/matrix/dmat3x2property.h>
-#include <openspace/properties/matrix/dmat3property.h>
-#include <openspace/properties/matrix/dmat3x4property.h>
-#include <openspace/properties/matrix/dmat4x2property.h>
-#include <openspace/properties/matrix/dmat4x3property.h>
-#include <openspace/properties/matrix/dmat4property.h>
-#include <openspace/properties/stringproperty.h>
-#include <ghoul/lua/ghoul_lua.h>
-#include <random>
-#include <iostream>
-
-namespace {
-    constexpr const int NumberFuzzTests = 10000;
-} // namespace
-
-TEST_CASE("LuaConversion: LuaExecution", "[luaconversion]") {
-    lua_State* state = luaL_newstate();
-    luaL_openlibs(state);
-
-    const int status = luaL_loadstring(state, "");
-    REQUIRE(status == LUA_OK);
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion", "[luaconversion]", bool, char, signed char,
-    unsigned char, short, unsigned short, int, unsigned int, long, unsigned long,
-    long long, unsigned long long, float, double, long double, glm::vec2, glm::vec3,
-    glm::vec4, glm::dvec2, glm::dvec3, glm::dvec4, glm::ivec2, glm::ivec3, glm::ivec4,
-    glm::uvec2, glm::uvec3, glm::uvec4, glm::mat2x2, glm::mat2x3, glm::mat2x4,
-    glm::mat3x2, glm::mat3x3, glm::mat3x4, glm::mat4x2, glm::mat4x3, glm::mat4x4,
-    glm::dmat2x2, glm::dmat2x3, glm::dmat2x4, glm::dmat3x2, glm::dmat3x3, glm::dmat3x4,
-    glm::dmat4x2, glm::dmat4x3, glm::dmat4x4)
-{
-    using T = TestType;
-
-    lua_State* state = luaL_newstate();
-    luaL_openlibs(state);
-
-    const T val(1);
-
-    using namespace openspace::properties;
-    const bool success = PropertyDelegate<TemplateProperty<T>>::template toLuaValue<T>(
-        state,
-        val
-    );
-    REQUIRE(success);
-    bool success2;
-    const T value = PropertyDelegate<TemplateProperty<T>>::template fromLuaValue<T>(
-        state,
-        success2
-    );
-    REQUIRE(success2);
-    REQUIRE(value == val);
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion Fuzz <short", "[luaconversion]", char, signed char,
-    unsigned char)
-{
-    using T = TestType;
-    using namespace openspace::properties;
-    
-    lua_State* state = luaL_newstate();
-
-    std::mt19937 gen(1337);
-    std::uniform_int_distribution<short> dis(
-        std::numeric_limits<T>::lowest(),
-        std::numeric_limits<T>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-
-        const T val = T(dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion Fuzz >short", "[luaconversion]", short, unsigned short,
-    int, unsigned int)
-{
-    using T = TestType;
-    using namespace openspace::properties;
-
-    lua_State* state = luaL_newstate();
-
-    std::mt19937 gen(1337);
-    std::uniform_int_distribution<T> dis(
-        std::numeric_limits<T>::lowest(),
-        std::numeric_limits<T>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-
-        const T val = T(dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-            );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-            );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-
-TEMPLATE_TEST_CASE("LuaConversion Fuzz Limited Signed", "[luaconversion]", long,
-    long long)
-{
-    using T = TestType;
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-
-    std::mt19937 gen(1337);
-    std::uniform_int_distribution<> dis(
-        // We need to limit the range of values as Lua uses 'doubles' to store, and some
-        // values will not be representable
-        std::numeric_limits<int>::lowest(),
-        std::numeric_limits<int>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion Fuzz Limited Unsigned", "[luaconversion]",
-    unsigned long, unsigned long long)
-{
-    using T = TestType;
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-
-    std::mt19937 gen(1337);
-    std::uniform_int_distribution<unsigned int> dis(
-        // We need to limit the range of values as Lua uses 'doubles' to store, and some
-        // values will not be representable
-        std::numeric_limits<unsigned int>::lowest(),
-        std::numeric_limits<unsigned int>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion Float Fuzz", "[luaconversion]", float, double,
-    long double)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<T> dis(
-        0.f,
-        std::numeric_limits<T>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-
-        if (typeid(T) == typeid(long double)) {
-            if (value != std::numeric_limits<long double>::infinity()) {
-                REQUIRE(value == val);
-            }
-        }
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Vec2 Float Fuzz", "[luaconversion]", glm::vec2,
-    glm::dvec2)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-TEMPLATE_TEST_CASE("LuaConversion: Vec2 Fuzz", "[luaconversion]", glm::ivec2, glm::uvec2)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_int_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Vec3 Float Fuzz", "[luaconversion]", glm::vec3,
-    glm::dvec3)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Vec3 Fuzz", "[luaconversion]", glm::ivec3, glm::uvec3)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_int_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Vec4 Float Fuzz", "[luaconversion]", glm::vec4,
-    glm::dvec4)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Vec4 Fuzz", "[luaconversion]", glm::ivec4, glm::uvec4)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_int_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Mat2x2 Fuzz", "[luaconversion]", glm::mat2x2,
-    glm::dmat2x2)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Mat2x3 Fuzz", "[luaconversion]", glm::mat2x3,
-    glm::dmat2x3)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Mat2x4 Fuzz", "[luaconversion]", glm::mat2x4,
-    glm::dmat2x4)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen),
-            dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Mat3x2 Fuzz", "[luaconversion]", glm::mat3x2,
-    glm::dmat3x2)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Mat3x3 Fuzz", "[luaconversion]", glm::mat3x3,
-    glm::dmat3x3)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen),
-            dis(gen), dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Mat3x4 Fuzz", "[luaconversion]", glm::mat3x4,
-    glm::dmat3x4)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen),
-            dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Mat4x2 Fuzz", "[luaconversion]", glm::mat4x2,
-    glm::dmat4x2)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen),
-            dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Mat4x3 Fuzz", "[luaconversion]", glm::mat4x3,
-    glm::dmat4x3)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen),
-            dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-TEMPLATE_TEST_CASE("LuaConversion: Mat4x4 Fuzz", "[luaconversion]", glm::mat4x4,
-    glm::dmat4x4)
-{
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    using T = TestType;
-
-    std::mt19937 gen(1337);
-    std::uniform_real_distribution<typename T::value_type> dis(
-        std::numeric_limits<typename T::value_type>::min(),
-        std::numeric_limits<typename T::value_type>::max()
-    );
-
-    for (int i = 0; i < NumberFuzzTests; ++i) {
-        const T val = T(dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen),
-            dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen), dis(gen),
-            dis(gen), dis(gen), dis(gen));
-
-        const bool success = PropertyDelegate<NumericalProperty<T>>::template toLuaValue<T>(
-            state,
-            val
-        );
-        REQUIRE(success);
-        bool success2;
-        const T value = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
-            state,
-            success2
-        );
-        REQUIRE(success2);
-        REQUIRE(value == val);
-
-        lua_pop(state, 1);
-    }
-
-    lua_close(state);
-}
-
-
-TEST_CASE("LuaConversion: String", "[luaconversion]") {
-    lua_State* state = luaL_newstate();
-
-    using namespace openspace::properties;
-    bool success
-          = PropertyDelegate<TemplateProperty<std::string>>::template toLuaValue<std::string>(
-                state, "value");
-    REQUIRE(success);
-    std::string value;
-    bool success2;
-    value = PropertyDelegate<TemplateProperty<std::string>>::template fromLuaValue<std::string>(
-        state,
-        success2
-    );
-    REQUIRE(success2);
-    REQUIRE(value == "value");
-
-    lua_close(state);
-}
diff --git a/tests/test_rawvolumeio.cpp b/tests/test_rawvolumeio.cpp
index bdf11abc51..e39780e88a 100644
--- a/tests/test_rawvolumeio.cpp
+++ b/tests/test_rawvolumeio.cpp
@@ -43,14 +43,14 @@ TEST_CASE("RawVolumeIO: TinyInputOutput", "[rawvolumeio]") {
     vol.set({ 0, 0, 0 }, value);
     REQUIRE(vol.get({ 0, 0, 0 }) == value);
 
-    std::string volumePath = absPath("${TESTDIR}/tinyvolume.rawvolume");
+    std::filesystem::path volumePath = absPath("${TESTDIR}/tinyvolume.rawvolume");
 
     // Write the 1x1x1 volume to disk
-    RawVolumeWriter<float> writer(volumePath);
+    RawVolumeWriter<float> writer(volumePath.string());
     writer.write(vol);
 
     // Read the 1x1x1 volume and make sure the value is the same.
-    RawVolumeReader<float> reader(volumePath, dims);
+    RawVolumeReader<float> reader(volumePath.string(), dims);
     std::unique_ptr<RawVolume<float>> storedVolume = reader.read();
     REQUIRE(storedVolume->get({ 0, 0, 0 }) == value);
 }
@@ -68,14 +68,14 @@ TEST_CASE("RawVolumeIO: BasicInputOutput", "[rawvolumeio]") {
 
     vol.forEachVoxel([&value](glm::uvec3 x, float v) { REQUIRE(v == value(x)); });
 
-    std::string volumePath = absPath("${TESTDIR}/basicvolume.rawvolume");
+    std::filesystem::path volumePath = absPath("${TESTDIR}/basicvolume.rawvolume");
 
     // Write the 2x4x8 volume to disk
-    RawVolumeWriter<float> writer(volumePath);
+    RawVolumeWriter<float> writer(volumePath.string());
     writer.write(vol);
 
     // Read the 2x4x8 volume and make sure the value is the same.
-    RawVolumeReader<float> reader(volumePath, dims);
+    RawVolumeReader<float> reader(volumePath.string(), dims);
     std::unique_ptr<RawVolume<float>> storedVolume = reader.read();
     vol.forEachVoxel([&value](glm::uvec3 x, float v) {
         REQUIRE(v == value(x));
diff --git a/tests/test_scriptscheduler.cpp b/tests/test_scriptscheduler.cpp
index baa7618d6d..0cd2913ff7 100644
--- a/tests/test_scriptscheduler.cpp
+++ b/tests/test_scriptscheduler.cpp
@@ -34,7 +34,7 @@
 TEST_CASE("ScriptScheduler: Simple Forward", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -66,7 +66,7 @@ TEST_CASE("ScriptScheduler: Simple Forward", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: Multiple Forward Single Jump", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -107,7 +107,7 @@ TEST_CASE("ScriptScheduler: Multiple Forward Single Jump", "[scriptscheduler]")
 TEST_CASE("ScriptScheduler: Multiple Forward Ordering", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -146,7 +146,7 @@ TEST_CASE("ScriptScheduler: Multiple Forward Ordering", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: Simple Backward", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -178,7 +178,7 @@ TEST_CASE("ScriptScheduler: Simple Backward", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: Multiple Backward Single Jump", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -220,7 +220,7 @@ TEST_CASE("ScriptScheduler: Multiple Backward Single Jump", "[scriptscheduler]")
 TEST_CASE("ScriptScheduler: Multiple Backward Ordering", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -259,7 +259,7 @@ TEST_CASE("ScriptScheduler: Multiple Backward Ordering", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: Empty", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -289,7 +289,7 @@ TEST_CASE("ScriptScheduler: Empty", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: Forward Backwards", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -335,7 +335,7 @@ TEST_CASE("ScriptScheduler: Forward Backwards", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: Rewind", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -375,7 +375,7 @@ TEST_CASE("ScriptScheduler: Rewind", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: CurrentTime", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -397,7 +397,7 @@ TEST_CASE("ScriptScheduler: CurrentTime", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: All Scripts", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -439,7 +439,7 @@ TEST_CASE("ScriptScheduler: All Scripts", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: Jump Equal", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -477,7 +477,7 @@ TEST_CASE("ScriptScheduler: Jump Equal", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: Same Time", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -508,7 +508,7 @@ TEST_CASE("ScriptScheduler: Same Time", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: Multi Inner Jump", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -548,7 +548,7 @@ TEST_CASE(
 {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -588,7 +588,7 @@ TEST_CASE("ScriptScheduler: Multiple Forward Ordering Multiple Load" "[scriptsch
 {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -626,7 +626,7 @@ TEST_CASE(
 {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -667,7 +667,7 @@ TEST_CASE(
 {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -704,7 +704,7 @@ TEST_CASE(
 TEST_CASE("ScriptScheduler: Forward Backwards Multiple Load", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -746,7 +746,7 @@ TEST_CASE("ScriptScheduler: Forward Backwards Multiple Load", "[scriptscheduler]
 TEST_CASE("ScriptScheduler: Rewind Multiple Load", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -782,7 +782,7 @@ TEST_CASE("ScriptScheduler: Rewind Multiple Load", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: All Scripts Multiple Load", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
@@ -820,7 +820,7 @@ TEST_CASE("ScriptScheduler: All Scripts Multiple Load", "[scriptscheduler]") {
 TEST_CASE("ScriptScheduler: All Scripts Mixed Load", "[scriptscheduler]") {
     openspace::SpiceManager::initialize();
     openspace::SpiceManager::ref().loadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     using namespace openspace::scripting;
diff --git a/tests/test_spicemanager.cpp b/tests/test_spicemanager.cpp
index 0881135772..6b0caab1e7 100644
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -45,54 +45,54 @@ namespace {
     // The remaining methods rely on multiple kernels, loaded as a SPICE 'meta-kernel'
     void loadMetaKernel() {
         const int k1 = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
         );
         REQUIRE(k1 == 1);
 
         const int k2 = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/cas00084.tsc")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/cas00084.tsc").string()
         );
         REQUIRE(k2 == 2);
 
         const int k3 = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/981005_PLTEPH-DE405S.bsp")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/981005_PLTEPH-DE405S.bsp").string()
         );
         REQUIRE(k3 == 3);
 
         const int k4 = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/020514_SE_SAT105.bsp")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/020514_SE_SAT105.bsp").string()
         );
         REQUIRE(k4 == 4);
 
         const int k5 = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/030201AP_SK_SM546_T45.bsp")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/030201AP_SK_SM546_T45.bsp").string()
         );
         REQUIRE(k5 == 5);
 
         const int k6 = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/cas_v37.tf")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/cas_v37.tf").string()
         );
         REQUIRE(k6 == 6);
 
         const int k7 = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/04135_04171pc_psiv2.bc")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/04135_04171pc_psiv2.bc").string()
         );
         REQUIRE(k7 == 7);
 
         const int k8 = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc").string()
         );
         REQUIRE(k8 == 8);
 
         const int k9 = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/cas_iss_v09.ti")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/cas_iss_v09.ti").string()
         );
         REQUIRE(k9 == 9);
     }
 
     int loadLSKKernel()  { 
         int kernelID = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
         );
         REQUIRE(kernelID == 1);
         return kernelID;
@@ -100,7 +100,7 @@ namespace {
 
     int loadPCKKernel()  {
         int kernelID = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/cpck05Mar2004.tpc").string()
         );
         REQUIRE(kernelID == 1);
         return kernelID;
@@ -153,7 +153,7 @@ TEST_CASE("SpiceManager: Unload Kernel String", "[spicemanager]") {
 
     // unload using string keyword
     openspace::SpiceManager::ref().unloadKernel(
-        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+        absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
     );
 
     found = SPICEFALSE;
diff --git a/tests/test_timequantizer.cpp b/tests/test_timequantizer.cpp
index cb7506a4f4..6f7f777a77 100644
--- a/tests/test_timequantizer.cpp
+++ b/tests/test_timequantizer.cpp
@@ -47,7 +47,7 @@ namespace {
 
     int loadLSKKernel() {
         int kernelID = openspace::SpiceManager::ref().loadKernel(
-            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls")
+            absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string()
         );
         REQUIRE(kernelID == 1);
         return kernelID;
@@ -148,6 +148,15 @@ TEST_CASE("TimeQuantizer: Test years resolution", "[timequantizer]") {
     singleTimeTest(testT, t1, true, "2028-12-08T23:59:59", "2025-12-09T00:00:00.000");
     singleTimeTest(testT, t1, true, "2028-12-09T00:00:01", "2028-12-09T00:00:00.000");
 
+    try {
+        t1.setStartEndRange("2020-02-29T00:00:00", "2030-02-29T00:00:00");
+    }
+    catch (const ghoul::RuntimeError& e) {
+        REQUIRE(e.message.find("Invalid start day value of 29 for the selected month "
+            "on a yearly increment, valid days are 1 - 28") != std::string::npos);
+    }
+    t1.setStartEndRange("2020-02-28T00:00:00", "2030-02-28T00:00:00");
+
     SpiceManager::deinitialize();
 }
 
@@ -191,6 +200,11 @@ TEST_CASE("TimeQuantizer: Test days resolution", "[timequantizer]") {
     singleTimeTest(testT, t1, true, "2020-03-01T00:30:00", "2020-03-01T00:00:00.000");
     singleTimeTest(testT, t1, true, "2019-03-04T00:00:02", "2019-03-04T00:00:00.000");
 
+    t1.setStartEndRange("2020-01-31T00:00:00", "2020-07-31T00:00:00");
+    t1.setResolution("1d");
+
+    singleTimeTest(testT, t1, true, "2020-03-01T00:30:00", "2020-03-01T00:00:00.000");
+
     SpiceManager::deinitialize();
 }
 
@@ -207,6 +221,14 @@ TEST_CASE("TimeQuantizer: Test months resolution", "[timequantizer]") {
     singleTimeTest(testT, t1, true, "2017-03-03T05:15:45", "2017-02-28T00:00:00.000");
     singleTimeTest(testT, t1, true, "2017-03-29T00:15:45", "2017-03-28T00:00:00.000");
 
+    try {
+        t1.setStartEndRange("2017-01-30T00:00:00", "2020-09-01T00:00:00");
+    }
+    catch (const ghoul::RuntimeError& e) {
+        REQUIRE(e.message.find("Invalid start day value of 30 for monthly increment, "
+                               "valid days are 1 - 28") != std::string::npos);
+    }
+
     t1.setStartEndRange("2016-01-17T00:00:00", "2020-09-01T00:00:00");
     t1.setResolution("2M");
 
@@ -333,7 +355,7 @@ TEST_CASE("TimeQuantizer: Test start time pre-existing object", "[timequantizer]
     globebrowsing::TimeQuantizer t1;
 
     singleStartTimeTest(t1, "2017-01-20T00:00:00", "Invalid start", false);
-    singleStartTimeTest(t1, "2017-01-29T00:00:00", "Invalid start day value", true);
+    singleStartTimeTest(t1, "2017-01-29T00:00:00", "Invalid start day value", false);
     singleStartTimeTest(t1, "2017-01-28T12:00:00", "Invalid start time value", true);
     singleStartTimeTest(t1, "2017-01-28T00:01:00", "Invalid start time value", true);
     singleStartTimeTest(t1, "2017-01-28T00:00:01", "Invalid start time value", true);
@@ -347,7 +369,7 @@ TEST_CASE("TimeQuantizer: Test start time using constructor", "[timequantizer]")
     loadLSKKernel();
 
     singleStartTimeTest("2017-01-20T00:00:00", "Invalid start", false);
-    singleStartTimeTest("2017-01-29T00:00:00", "Invalid start day value", true);
+    singleStartTimeTest("2017-01-32T00:00:00", "For January the day must be at least 1.0D0 and less than 3.2E+01", true);
     singleStartTimeTest("2017-01-28T12:00:00", "Invalid start time value", true);
     singleStartTimeTest("2017-01-28T00:01:00", "Invalid start time value", true);
     singleStartTimeTest("2017-01-28T00:00:01", "Invalid start time value", true);